]> Sergey Matveev's repositories - public-inbox.git/commitdiff
watch: log signal activities to STDERR
authorEric Wong <e@yhbt.net>
Mon, 31 Aug 2020 04:41:33 +0000 (04:41 +0000)
committerEric Wong <e@80x24.org>
Tue, 1 Sep 2020 00:19:16 +0000 (00:19 +0000)
Sometimes it may not be apparent when/if a signal is
processed, this hopefully improves the situation.

We'll also change the process title when we're quitting
to better inform users.

script/public-inbox-watch

index 0249186000b6ee47ea45cd5d03e50a49e04bf333..b6c6b2022bb7ae64e6aae5e4cccaa73b68866e59 100755 (executable)
@@ -11,18 +11,30 @@ use PublicInbox::Syscall qw($SFD_NONBLOCK);
 my $oldset = PublicInbox::Sigfd::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("I: 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 "I: scanning\n";
+               $watch->trigger_scan('full');
+       };
        my $quit = sub {
                $watch->quit if $watch;
                $watch = undef;
+               $0 .= ' quitting';
        };
        my $sig = {
                HUP => $reload,