From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 16 Dec 2015 09:38:20 +0000 (+0100)
Subject: Output also lockname if it cannot be acquired
X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=b148e99f3ffce61317f1b8100f3e6709a34860c0

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 <t.lamprecht@proxmox.com>
---

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";
         }