unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] watch: avoid potential race condition while quitting
Date: Mon, 26 Jun 2017 17:45:25 +0000	[thread overview]
Message-ID: <20170626174525.2979-1-e@80x24.org> (raw)

We must not trigger future activity when initializing
a -watch shutdown.
---
 lib/PublicInbox/WatchMaildir.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 8e10e43..5ae3d21 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -225,7 +225,7 @@ sub watch {
 
 sub trigger_scan {
 	my ($self, $base) = @_;
-	my $dir = $self->{scandir} or die "not watch-ing, yet\n";
+	my $dir = $self->{scandir} or return;
 	open my $fh, '>', "$dir/$base" or die "open $dir/$base failed: $!\n";
 	close $fh or die "close $dir/$base failed: $!\n";
 }
@@ -235,6 +235,7 @@ sub scan {
 	if ($path =~ /quit\z/) {
 		%{$self->{opendirs}} = ();
 		_done_for_now($self);
+		delete $self->{scandir};
 		$self->{quit} = 1;
 		return;
 	}
-- 
EW


                 reply	other threads:[~2017-06-26 17:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20170626174525.2979-1-e@80x24.org \
    --to=e@80x24.org \
    --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).