rename {pi_config} fields to {pi_cfg}

[public-inbox.git] / lib / PublicInbox / Lock.pm

diff --git a/lib/PublicInbox/Lock.pm b/lib/PublicInbox/Lock.pm
index c0d4d3b35c4a4bbaa5d90c4273eb6cfcc383b6be..b2c8227f0a66c8940d9be8e60afb8571015f0fc0 100644 (file)
--- a/lib/PublicInbox/Lock.pm
+++ b/lib/PublicInbox/Lock.pm
@@ -12,23 +12,24 @@ use Carp qw(croak);
 # PublicInbox::Import already has the lock on its own.
 sub lock_acquire {
        my ($self) = @_;
-       croak 'already locked' if $self->{lockfh};
-       my $lock_path = $self->{lock_path} or return;
+       my $lock_path = $self->{lock_path};
+       croak 'already locked '.($lock_path // '(undef)') if $self->{lockfh};
+       return unless defined($lock_path);
        sysopen(my $lockfh, $lock_path, O_WRONLY|O_CREAT) or
-               die "failed to open lock $lock_path: $!\n";
-       flock($lockfh, LOCK_EX) or die "lock failed: $!\n";
+               croak "failed to open $lock_path: $!\n";
+       flock($lockfh, LOCK_EX) or croak "lock $lock_path failed: $!\n";
        $self->{lockfh} = $lockfh;
 }
 
 sub lock_release {
        my ($self, $wake) = @_;
-       return unless $self->{lock_path};
-       my $lockfh = delete $self->{lockfh} or croak 'not locked';
+       defined(my $lock_path = $self->{lock_path}) or return;
+       my $lockfh = delete $self->{lockfh} or croak "not locked: $lock_path";
 
        syswrite($lockfh, '.') if $wake;
 
-       flock($lockfh, LOCK_UN) or die "unlock failed: $!\n";
-       close $lockfh or die "close failed: $!\n";
+       flock($lockfh, LOCK_UN) or croak "unlock $lock_path failed: $!\n";
+       close $lockfh or croak "close $lock_path failed: $!\n";
 }
 
 1;