Fix cleanup of empty tile directories

[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 8278545ae3753b55e5603673f13d6099f4112ef4..fa69ef4d93b22e5dd0b693b6d603a0de134ca0b0 100644 (file)
--- a/cookbooks/tile/templates/default/cleanup-tiles.erb
+++ b/cookbooks/tile/templates/default/cleanup-tiles.erb
@@ -12,7 +12,7 @@ use LockFile::Simple;
 
 my $tiledir = shift @ARGV;
 
-my $lockmgr = LockFile::Simple->make(-autoclean => 1, -max => 1, -hold => 0, -warn => 0);
+my $lockmgr = LockFile::Simple->make(-autoclean => 1, -max => 1, -hold => 0, -warn => 0, -stale => 1);
 
 $lockmgr->lock("${tiledir}/cleanup") || exit 0;
 
@@ -38,7 +38,7 @@ if (df($tiledir)->{per} > 90)
 
                 for (my $dir = dirname($tile); $dir ne $tiledir; $dir = dirname($dir))
                 {
-                    unlink($dir);
+                    rmdir($dir);
                 }
             }
             else