watch: improve fairness during full rescans

[public-inbox.git] / script / public-inbox-watch

diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index bb655929fdbf0050a5f37d4ed622eab759962114..51f1baa29c98868c6d9ded5c57702540fc1d3a46 100755 (executable)
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -8,14 +8,15 @@ 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;
+       $watch_md->watch while ($watch_md);
 }