From 8b0359338d1ec1e0ec7521c77b35f878931f4cd6 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 24 Jun 2017 22:26:28 +0000
Subject: [PATCH] watch: use "self-inotify-tempfile trick" for quit

This should be more reliable and safer as it'll ensure
existing fast-import instances are shut down properly.
---
 lib/PublicInbox/WatchMaildir.pm | 12 ++++++++++--
 script/public-inbox-watch       |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 0e2a6d2c..5e79bb50 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -201,7 +201,7 @@ sub _try_path {
 	$im->add($mime, $self->{spamcheck});
 }
 
-sub quit { $_[0]->{quit} = 1 }
+sub quit { trigger_scan($_[0], 'quit') }
 
 sub watch {
 	my ($self) = @_;
@@ -215,7 +215,7 @@ sub watch {
 	# in the future...
 	require Filesys::Notify::Simple;
 	my $fsn = Filesys::Notify::Simple->new([@{$self->{mdir}}, $scandir]);
-	$fsn->wait($cb) until ($self->{quit});
+	$fsn->wait($cb) until $self->{quit};
 }
 
 sub trigger_scan {
@@ -227,6 +227,14 @@ sub trigger_scan {
 
 sub scan {
 	my ($self, $path) = @_;
+	if ($path =~ /quit\z/) {
+		%{$self->{opendirs}} = ();
+		_done_for_now($self);
+		$self->{quit} = 1;
+		return;
+	}
+	# else: $path =~ /(cont|full)\z/
+	return if $self->{quit};
 	my $max = 10;
 	my $opendirs = $self->{opendirs};
 	my @dirnames = keys %$opendirs;
diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 51f1baa2..0d1cd831 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -17,6 +17,10 @@ if ($watch_md) {
 	$SIG{HUP} = $reload;
 	$SIG{USR1} = $scan;
 	$SIG{ALRM} = sub { $SIG{ALRM} = 'DEFAULT'; $scan->() };
+	$SIG{QUIT} = $SIG{TERM} = $SIG{INT} = sub {
+		$watch_md->quit if $watch_md;
+		$watch_md = undef;
+	};
 	alarm(1);
 	$watch_md->watch while ($watch_md);
 }
-- 
2.44.0