X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e2fccde243e82951a757683066a80071f67bda2b..0ce79daea5fc346d5d00b36460eb648673683076:/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 31a7fadd9..5c914f3bb 100644
--- a/cookbooks/tile/templates/default/cleanup-tiles.erb
+++ b/cookbooks/tile/templates/default/cleanup-tiles.erb
@@ -13,7 +13,7 @@ my $tempfile = tmpnam();
 
 if (df($tiledir)->{per} > 90)
 {
-    system("find", $tiledir, "-xdev", "-type", "f", "-name", "*.meta", "-atime", "+60", "-fprintf", $tempfile, "%A@ %p\n");
+    system("find", $tiledir, "-xdev", "-type", "f", "-name", "*.meta", "-atime", "+45", "-fprintf", $tempfile, "%A@ %p\n");
 
     open(TILES, "-|", "sort", "-n", $tempfile) || die "Can't open $tempfile: $!";
 
@@ -29,10 +29,18 @@ if (df($tiledir)->{per} > 90)
 
                 unlink($tile) || warn "Can't remove $tile: $!";
             }
+            else
+            {
+                goto done;
+            }
         }
     }
 
+  done:
+
     close(TILES);
+
+    warn "Tile expiry finished before threshold reached" if df($tiledir)->{per} > 80;
 }
 
 unlink($tempfile);