rename WatchMaildir => Watch

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

diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 2057066a2a9038589120d7ed424550aef44b1444..0249186000b6ee47ea45cd5d03e50a49e04bf333 100755 (executable)
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -2,26 +2,44 @@
 # 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 IO::Handle;
+use PublicInbox::Watch;
 use PublicInbox::Config;
-my ($config, $watch_md);
+use PublicInbox::DS;
+use PublicInbox::Sigfd;
+use PublicInbox::Syscall qw($SFD_NONBLOCK);
+my $oldset = PublicInbox::Sigfd::block_signals();
+STDOUT->autoflush(1);
+STDERR->autoflush(1);
+my ($config, $watch);
 my $reload = sub {
        $config = PublicInbox::Config->new;
-       $watch_md->quit if $watch_md;
-       $watch_md = PublicInbox::WatchMaildir->new($config);
+       $watch->quit if $watch;
+       $watch = PublicInbox::Watch->new($config);
 };
 $reload->();
-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->() };
-       $SIG{QUIT} = $SIG{TERM} = $SIG{INT} = sub {
-               $watch_md->quit if $watch_md;
-               $watch_md = undef;
+if ($watch) {
+       my $scan = sub { $watch->trigger_scan('full') if $watch };
+       my $quit = sub {
+               $watch->quit if $watch;
+               $watch = undef;
        };
+       my $sig = {
+               HUP => $reload,
+               USR1 => $scan,
+               CHLD => \&PublicInbox::DS::enqueue_reap,
+       };
+       $sig->{QUIT} = $sig->{TERM} = $sig->{INT} = $quit;
+
        # --no-scan is only intended for testing atm, undocumented.
-       alarm(1) unless (grep(/\A--no-scan\z/, @ARGV));
-       $watch_md->watch while ($watch_md);
+       unless (grep(/\A--no-scan\z/, @ARGV)) {
+               PublicInbox::DS::requeue($scan);
+       }
+       my $sigfd = PublicInbox::Sigfd->new($sig, $SFD_NONBLOCK);
+       local %SIG = (%SIG, %$sig) if !$sigfd;
+       if (!$sigfd) {
+               PublicInbox::Sigfd::set_sigmask($oldset);
+               PublicInbox::DS->SetLoopTimeout(1000);
+       }
+       $watch->watch($sig, $oldset) while ($watch);
 }