X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-watch;h=af02d8f358f7b84392744b68df49a4328fc69636;hb=6e0ac7612095397ef3b9e019f772d724c62eac5b;hp=b6d545adad782c81cecb92c49e3dbb7578575546;hpb=58c0333adbdd9f5f82309cb6eef3c379f0ff064e;p=public-inbox.git
diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index b6d545ad..af02d8f3 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -1,39 +1,58 @@
#!/usr/bin/perl -w
-# Copyright (C) 2016-2020 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
+my $help = <autoflush
+use PublicInbox::Watch;
use PublicInbox::Config;
use PublicInbox::DS;
-use PublicInbox::Sigfd;
-use PublicInbox::Syscall qw(SFD_NONBLOCK);
-my $oldset = PublicInbox::Sigfd::block_signals();
-my ($config, $watch_md);
+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::DS::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->trigger_scan('full') if $watch_md };
+
+if ($watch) {
+ my $scan = sub {
+ return if !$watch;
+ warn "I: scanning\n";
+ $watch->trigger_scan('full');
+ };
my $quit = sub {
- $watch_md->quit if $watch_md;
- $watch_md = undef;
+ $watch->quit if $watch;
+ $watch = undef;
+ $0 .= ' quitting';
+ };
+ my $sig = {
+ HUP => $reload,
+ USR1 => $scan,
+ CHLD => \&PublicInbox::DS::enqueue_reap,
};
- my $sig = { HUP => $reload, USR1 => $scan };
$sig->{QUIT} = $sig->{TERM} = $sig->{INT} = $quit;
# --no-scan is only intended for testing atm, undocumented.
- 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_md->watch($sig, $oldset) while ($watch_md);
+ PublicInbox::DS::requeue($scan) if $do_scan;
+ $watch->watch($sig, $oldset) while ($watch);
}