X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-watch;h=2057066a2a9038589120d7ed424550aef44b1444;hb=b2b1006759730507731fcd3fc3e0de68239e3b92;hp=bb655929fdbf0050a5f37d4ed622eab759962114;hpb=9a38d54754c724c5f81e8dc000bd42dbeddc39a6;p=public-inbox.git

diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index bb655929..2057066a 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -8,14 +8,20 @@ use PublicInbox::Config;
 my ($config, $watch_md);
 my $reload = sub {
 	$config = PublicInbox::Config->new;
+	$watch_md->quit if $watch_md;
 	$watch_md = PublicInbox::WatchMaildir->new($config);
 };
 $reload->();
 if ($watch_md) {
-	my $scan = sub { $watch_md->scan if $watch_md };
+	my $scan = sub { $watch_md->trigger_scan('full') if $watch_md };
 	$SIG{HUP} = $reload;
 	$SIG{USR1} = $scan;
 	$SIG{ALRM} = sub { $SIG{ALRM} = 'DEFAULT'; $scan->() };
-	alarm(1);
-	$watch_md->watch;
+	$SIG{QUIT} = $SIG{TERM} = $SIG{INT} = sub {
+		$watch_md->quit if $watch_md;
+		$watch_md = undef;
+	};
+	# --no-scan is only intended for testing atm, undocumented.
+	alarm(1) unless (grep(/\A--no-scan\z/, @ARGV));
+	$watch_md->watch while ($watch_md);
 }