X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/55ddc5ad47a565d50f805272a60f238fae51aaf4..57995a029cd7185564cfb3a24bf55354a0cf46fe:/cookbooks/tile/templates/default/cleanup-tiles.erb

diff --git a/cookbooks/tile/templates/default/cleanup-tiles.erb b/cookbooks/tile/templates/default/cleanup-tiles.erb
index cd8696ac4..5a954e295 100644
--- a/cookbooks/tile/templates/default/cleanup-tiles.erb
+++ b/cookbooks/tile/templates/default/cleanup-tiles.erb
@@ -7,13 +7,19 @@ use warnings;
 
 use File::Temp qw(tmpnam);
 use Filesys::Df;
+use LockFile::Simple;
 
 my $tiledir = shift @ARGV;
+
+my $lockmgr = LockFile::Simple->make(-autoclean => 1, -max => 0, -warn => 0);
+
+$lockmgr->lock("${tiledir}/cleanup") || exit 0;
+
 my $tempfile = tmpnam();
 
 if (df($tiledir)->{per} > 90)
 {
-    system("find", $tiledir, "-xdev", "-type", "f", "-name", "*.meta", "-atime", "+45", "-fprintf", $tempfile, "%A@ %p\n");
+    system("find", $tiledir, "-xdev", "-type", "f", "-name", "*.meta", "-atime", "+35", "-fprintf", $tempfile, "%A@ %p\n");
 
     open(TILES, "-|", "sort", "-n", $tempfile) || die "Can't open $tempfile: $!";
 
@@ -39,10 +45,12 @@ if (df($tiledir)->{per} > 90)
   done:
 
     close(TILES);
+
+    warn "Tile expiry finished before threshold reached" if df($tiledir)->{per} > 80;
 }
 
 unlink($tempfile);
 
-warn "Tile expiry finished before threshold reached" if df($tiledir)->{per} > 80;
+$lockmgr->unlock("${tiledir}/cleanup");
 
 exit 0;