From b148e99f3ffce61317f1b8100f3e6709a34860c0 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 16 Dec 2015 10:38:20 +0100 Subject: [PATCH] Output also lockname if it cannot be acquired If we can't acquire the lock in lock_file_full and get interrupted by a signal inqeual to EINTR (e.g. SIGTERM), output also it's name in the error message to allow better debugging. Also fix a typo. Signed-off-by: Thomas Lamprecht --- src/PVE/Tools.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index ae06c12..64a57e9 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -131,7 +131,7 @@ sub lock_file_full { } if (!flock ($lock_handles->{$$}->{$filename}, $mode|LOCK_NB)) { - print STDERR "trying to aquire lock..."; + print STDERR "trying to acquire lock..."; my $success; while(1) { $success = flock($lock_handles->{$$}->{$filename}, $mode); @@ -142,7 +142,7 @@ sub lock_file_full { } if (!$success) { print STDERR " failed\n"; - die "can't aquire lock - $!\n"; + die "can't acquire lock '$filename' - $!\n"; } print STDERR " OK\n"; } -- 2.39.2