No ext_urls

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

diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 0249186000b6ee47ea45cd5d03e50a49e04bf333..4c50461ff4c02950d14d1aa763e0319bd3ee059f 100755 (executable)
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -1,28 +1,49 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 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 IO::Handle;
+use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
+use IO::Handle; # ->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 $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);
-my ($config, $watch);
+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->quit if $watch;
-       $watch = PublicInbox::Watch->new($config);
+       my $prev = $watch or return; # SIGQUIT issued
+       $watch->quit;
+       $watch = PublicInbox::Watch->new(PublicInbox::Config->new);
+       if ($watch) {
+               warn "# reloaded\n";
+       } else {
+               warn("E: reloading failed\n");
+               $watch = $prev;
+       }
 };
-$reload->();
+
 if ($watch) {
-       my $scan = sub { $watch->trigger_scan('full') if $watch };
+       my $scan = sub {
+               return if !$watch;
+               warn "# scanning\n";
+               $watch->trigger_scan('full');
+       };
        my $quit = sub {
                $watch->quit if $watch;
                $watch = undef;
+               $0 .= ' quitting';
        };
        my $sig = {
                HUP => $reload,
@@ -32,14 +53,6 @@ if ($watch) {
        $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);
-       }
+       PublicInbox::DS::requeue($scan) if $do_scan;
        $watch->watch($sig, $oldset) while ($watch);
 }