projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b67282
)
Cleanup empty directories when expiring tiles
author
Tom Hughes
<tom@compton.nu>
Wed, 6 May 2015 18:47:23 +0000
(19:47 +0100)
committer
Tom Hughes
<tom@compton.nu>
Wed, 6 May 2015 18:47:23 +0000
(19:47 +0100)
cookbooks/tile/templates/default/cleanup-tiles.erb
patch
|
blob
|
history
diff --git
a/cookbooks/tile/templates/default/cleanup-tiles.erb
b/cookbooks/tile/templates/default/cleanup-tiles.erb
index b0a6a7419775b11cad211a47849741f4a3cb13f4..8278545ae3753b55e5603673f13d6099f4112ef4 100644
(file)
--- 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
{