From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH] lock: show failure path
Date: Thu, 30 Jul 2020 08:05:33 +0000 [thread overview]
Message-ID: <20200730080533.GA8841@dcvr> (raw)
This ought to be useful for diagnosing bugs in -watch.
---
Tracking down a problem in -watch with Maildirs...
lib/PublicInbox/Lock.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Lock.pm b/lib/PublicInbox/Lock.pm
index c0d4d3b3..ca43682f 100644
--- a/lib/PublicInbox/Lock.pm
+++ b/lib/PublicInbox/Lock.pm
@@ -12,8 +12,9 @@ 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";
next reply other threads:[~2020-07-30 8:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 8:05 Eric Wong [this message]
2020-07-31 8:56 ` [PATCH 2/1] improve error handling on import fork failures Eric Wong
2020-07-31 21:36 ` [PATCH 2/1 v2] improve error handling on import fork / lock failures Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730080533.GA8841@dcvr \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).