From 23b6f6fb29fba9c2a7f9e6d9bf8d1ece35bc66f2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 6 Oct 2013 10:18:26 +0100 Subject: [PATCH] Don't warn when the tile cleanup script can't get a lock --- cookbooks/tile/templates/default/cleanup-tiles.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cookbooks/tile/templates/default/cleanup-tiles.erb b/cookbooks/tile/templates/default/cleanup-tiles.erb index 9209a2644..0f9bff288 100644 --- a/cookbooks/tile/templates/default/cleanup-tiles.erb +++ b/cookbooks/tile/templates/default/cleanup-tiles.erb @@ -7,11 +7,13 @@ use warnings; use File::Temp qw(tmpnam); use Filesys::Df; -use LockFile::Simple qw(lock unlock); +use LockFile::Simple; my $tiledir = shift @ARGV; -lock($tiledir) || exit 0; +my $lockmgr = LockFile::Simple->make(-autoclean => 1, -max => 0, -warn => 0); + +$lockmgr->lock($tiledir) || exit 0; my $tempfile = tmpnam(); @@ -49,6 +51,6 @@ if (df($tiledir)->{per} > 90) unlink($tempfile); -unlock($tiledir); +$lockmgr->unlock($tiledir); exit 0; -- 2.43.2