X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-watch;h=645abeda971688b3849e77de4bd5cdd46960b0b2;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=42ae55ae9b760567e4238738329a7457a59994b5;hpb=619b9d46b91cdf0f523b3804ec9a07b0f1ba4efe;p=public-inbox.git

diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 42ae55ae..645abeda 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -1,16 +1,26 @@
 #!/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;
 use PublicInbox::WatchMaildir;
 use PublicInbox::Config;
-my $config = PublicInbox::Config->new;
-my $watch_md = PublicInbox::WatchMaildir->new($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 };
+	my $scan = sub { $watch_md->trigger_scan('full') 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;
+	$watch_md->watch while ($watch_md);
 }