#!/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>
+my $help = <<EOF;
+usage: public-inbox-watch
+
+See public-inbox-watch(1) man page for full documentation.
+EOF
+
use strict;
-use warnings;
-use PublicInbox::WatchMaildir;
+use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
+use IO::Handle; # ->autoflush
+use PublicInbox::Watch;
use PublicInbox::Config;
-my ($config, $watch_md);
+use PublicInbox::DS;
+use PublicInbox::Sigfd;
+use PublicInbox::Syscall qw($SFD_NONBLOCK);
+my $do_scan = 1;
+GetOptions('scan!' => \$do_scan, # undocumented, testing only
+ 'help|h' => \(my $show_help)) or do { print STDERR $help; exit 1 };
+if ($show_help) { print $help; exit 0 };
+my $oldset = PublicInbox::Sigfd::block_signals();
+STDOUT->autoflush(1);
+STDERR->autoflush(1);
+local $0 = $0; # local since this script may be eval-ed
+my $watch = PublicInbox::Watch->new(PublicInbox::Config->new);
my $reload = sub {
- $config = PublicInbox::Config->new;
- $watch_md->quit if $watch_md;
- $watch_md = PublicInbox::WatchMaildir->new($config);
+ my $prev = $watch or return; # SIGQUIT issued
+ $watch->quit;
+ $watch = PublicInbox::Watch->new(PublicInbox::Config->new);
+ if ($watch) {
+ warn("I: reloaded\n");
+ } else {
+ warn("E: reloading failed\n");
+ $watch = $prev;
+ }
};
-$reload->();
-if ($watch_md) {
- my $scan = sub { $watch_md->scan if $watch_md };
- $SIG{HUP} = $reload;
- $SIG{USR1} = $scan;
- $SIG{ALRM} = sub { $SIG{ALRM} = 'DEFAULT'; $scan->() };
- alarm(1);
- $watch_md->watch while ($watch_md);
+
+if ($watch) {
+ my $scan = sub {
+ return if !$watch;
+ warn "I: scanning\n";
+ $watch->trigger_scan('full');
+ };
+ my $quit = sub {
+ $watch->quit if $watch;
+ $watch = undef;
+ $0 .= ' quitting';
+ };
+ 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.
+ PublicInbox::DS::requeue($scan) if $do_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);
}