Experimentally increase loadavg cutoff for mapnik export service

[chef.git] / 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 9209a2644d8116663b16cbfc60b951ba52981625..b0a6a7419775b11cad211a47849741f4a3cb13f4 100644 (file)
--- a/cookbooks/tile/templates/default/cleanup-tiles.erb
+++ b/cookbooks/tile/templates/default/cleanup-tiles.erb
@@ -7,17 +7,19 @@ use warnings;
 
 use File::Temp qw(tmpnam);
 use Filesys::Df;
-use LockFile::Simple qw(lock unlock);
+use LockFile::Simple;
 
 my $tiledir = shift @ARGV;
 
-lock($tiledir) || exit 0;
+my $lockmgr = LockFile::Simple->make(-autoclean => 1, -max => 1, -hold => 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", "+35", "-fprintf", $tempfile, "%A@ %p\n");
+    system("find", $tiledir, "-xdev", "-name", "lost+found", "-prune", "-o", "-type", "f", "-name", "*.meta", "-atime", "+10", "-fprintf", $tempfile, "%A@ %p\n");
 
     open(TILES, "-|", "sort", "-n", $tempfile) || die "Can't open $tempfile: $!";
 
@@ -49,6 +51,6 @@ if (df($tiledir)->{per} > 90)
 
 unlink($tempfile);
 
-unlock($tiledir);
+$lockmgr->unlock("${tiledir}/cleanup");
 
 exit 0;