user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
* [PATCH] watch: avoid potential race condition while quitting
@ 2017-06-26 17:45 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2017-06-26 17:45 UTC (permalink / raw)
  To: meta

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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-06-26 17:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-26 17:45 [PATCH] watch: avoid potential race condition while quitting Eric Wong

Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

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).