Display cache server name in tile server debug output

[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 0f9bff288e16f0027a01828628efe1b5d185c4ca..de696c659b89afd9c34a689755e0472d789a4a5d 100644 (file)
--- a/cookbooks/tile/templates/default/cleanup-tiles.erb
+++ b/cookbooks/tile/templates/default/cleanup-tiles.erb
@@ -11,15 +11,15 @@ use LockFile::Simple;
 
 my $tiledir = shift @ARGV;
 
 
 my $tiledir = shift @ARGV;
 

-my $lockmgr = LockFile::Simple->make(-autoclean => 1, -max => 0, -warn => 0);
+my $lockmgr = LockFile::Simple->make(-autoclean => 1, -max => 1, -hold => 0, -warn => 0);

 
 

-$lockmgr->lock($tiledir) || exit 0;
+$lockmgr->lock("${tiledir}/cleanup") || exit 0;

 
 my $tempfile = tmpnam();
 
 if (df($tiledir)->{per} > 90)
 {
 
 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", "-type", "f", "-name", "*.meta", "-atime", "+28", "-fprintf", $tempfile, "%A@ %p\n");

 
     open(TILES, "-|", "sort", "-n", $tempfile) || die "Can't open $tempfile: $!";
 
 
     open(TILES, "-|", "sort", "-n", $tempfile) || die "Can't open $tempfile: $!";
 


@@ -51,6 +51,6 @@ if (df($tiledir)->{per} > 90)
 
 unlink($tempfile);
 
 
 unlink($tempfile);
 

-$lockmgr->unlock($tiledir);
+$lockmgr->unlock("${tiledir}/cleanup");

 
 exit 0;
 
 exit 0;