From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Sep 2013 17:54:45 +0000 (+0100)
Subject: Warn if tile expiry doesn't manage to delete enough tiles
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/31a4c95a00ffaf0a31dea1fafd24072e2268c2a5

Warn if tile expiry doesn't manage to delete enough tiles
---

diff --git a/cookbooks/tile/templates/default/cleanup-tiles.erb b/cookbooks/tile/templates/default/cleanup-tiles.erb
index e58e0bdbf..73baaffd9 100644
--- a/cookbooks/tile/templates/default/cleanup-tiles.erb
+++ b/cookbooks/tile/templates/default/cleanup-tiles.erb
@@ -17,7 +17,7 @@ if (df($tiledir)->{per} > 90)
 
     open(TILES, "-|", "sort", "-n", $tempfile) || die "Can't open $tempfile: $!";
 
-    while (df($tiledir)->{per} > 80  && ! eof(TILES))
+    while (df($tiledir)->{per} > 80)
     {
         for my $n (1..1000)
         {
@@ -29,12 +29,20 @@ if (df($tiledir)->{per} > 90)
 
                 unlink($tile) || warn "Can't remove $tile: $!";
             }
+            else
+            {
+                goto done;
+            }
         }
     }
 
+  done:
+
     close(TILES);
 }
 
 unlink($tempfile);
 
+warn "Tile expiry finished before threshold reached" if df($tiledir)->{per} > 80;
+
 exit 0;