From bb0b3ef68eeb29f499491d277e981c4c95a486d0 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 6 May 2015 19:47:23 +0100 Subject: [PATCH] Cleanup empty directories when expiring tiles --- cookbooks/tile/templates/default/cleanup-tiles.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cookbooks/tile/templates/default/cleanup-tiles.erb b/cookbooks/tile/templates/default/cleanup-tiles.erb index b0a6a7419..8278545ae 100644 --- a/cookbooks/tile/templates/default/cleanup-tiles.erb +++ b/cookbooks/tile/templates/default/cleanup-tiles.erb @@ -5,6 +5,7 @@ use strict; use warnings; +use File::Basename; use File::Temp qw(tmpnam); use Filesys::Df; use LockFile::Simple; @@ -34,6 +35,11 @@ if (df($tiledir)->{per} > 90) my($time,$tile) = split(/ /, $line); unlink($tile) || warn "Can't remove $tile: $!"; + + for (my $dir = dirname($tile); $dir ne $tiledir; $dir = dirname($dir)) + { + unlink($dir); + } } else { -- 2.43.2