X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-watch;h=4c50461ff4c02950d14d1aa763e0319bd3ee059f;hb=refs%2Fheads%2Fmaster;hp=1d164aa39ab2df0b77c765ec60378ad087a0d8d8;hpb=805d781654e2c2b530de57de2d5241909d187058;p=public-inbox.git
diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 1d164aa3..4c50461f 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright (C) 2016-2020 all contributors
+# Copyright (C) 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 $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();
+my $oldset = PublicInbox::DS::block_signals();
STDOUT->autoflush(1);
STDERR->autoflush(1);
local $0 = $0; # local since this script may be eval-ed
@@ -29,7 +27,7 @@ my $reload = sub {
$watch->quit;
$watch = PublicInbox::Watch->new(PublicInbox::Config->new);
if ($watch) {
- warn("I: reloaded\n");
+ warn "# reloaded\n";
} else {
warn("E: reloading failed\n");
$watch = $prev;
@@ -39,7 +37,7 @@ my $reload = sub {
if ($watch) {
my $scan = sub {
return if !$watch;
- warn "I: scanning\n";
+ warn "# scanning\n";
$watch->trigger_scan('full');
};
my $quit = sub {
@@ -56,12 +54,5 @@ if ($watch) {
# --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);
}