lei up --all: show output for warnings

[public-inbox.git] / lib / PublicInbox / LEI.pm

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index b8159cba29229e1dfecd038f6d33d3874b8227bd..183cb545fe55276053c0d9110eef0823d1d08d11 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -18,8 +18,7 @@ use POSIX qw(strftime);
 use IO::Handle ();
 use Fcntl qw(SEEK_SET);
 use PublicInbox::Config;
-use PublicInbox::Syscall qw(SFD_NONBLOCK EPOLLIN EPOLLET);
-use PublicInbox::Sigfd;
+use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
 use PublicInbox::DS qw(now dwaitpid);
 use PublicInbox::Spawn qw(spawn popen_rd);
 use PublicInbox::Lock;
@@ -204,6 +203,11 @@ our %CMD = ( # sorted in order of importance/use:
        qw(git-dir=s@ cwd! verbose|v+ color:s no-color drq:1 dequote-only:1),
        @diff_opt, @lxs_opt, @net_opt, @c_opt ],
 
+'mail-diff' => [ '--stdin|LOCATION...', 'diff the contents of emails',
+       'stdin|', # /|\z/ must be first for lone dash
+       qw(verbose|v+ color:s no-color raw-header),
+       @diff_opt, @net_opt, @c_opt ],
+
 'add-external' => [ 'LOCATION',
        'add/set priority of a publicinbox|extindex for extra matches',
        qw(boost=i mirror=s inbox-version=i epoch=s verbose|v+),
@@ -518,7 +522,7 @@ sub sigint_reap {
 sub fail ($$;$) {
        my ($self, $buf, $exit_code) = @_;
        $self->{failed}++;
-       err($self, $buf) if defined $buf;
+       warn($buf, "\n") if defined $buf;
        $self->{pkt_op_p}->pkt_do('fail_handler') if $self->{pkt_op_p};
        x_it($self, ($exit_code // 1) << 8);
        undef;
@@ -538,7 +542,7 @@ sub puts ($;@) { out(shift, map { "$_\n" } @_) }
 sub child_error { # passes non-fatal curl exit codes to user
        my ($self, $child_error, $msg) = @_; # child_error is $?
        $child_error ||= 1 << 8;
-       $self->err($msg) if $msg;
+       warn($msg, "\n") if defined $msg;
        if ($self->{pkt_op_p}) { # to top lei-daemon
                $self->{pkt_op_p}->pkt_do('child_error', $child_error);
        } elsif ($self->{sock}) { # to lei(1) client
@@ -584,8 +588,12 @@ sub _lei_atfork_child {
        eval 'no warnings; undef $PublicInbox::LeiNoteEvent::to_flush';
        undef $errors_log;
        $quit = \&CORE::exit;
-       $self->{-eml_noisy} or # only "lei import" sets this atm
-               $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
+       if (!$self->{-eml_noisy}) { # only "lei import" sets this atm
+               my $cb = $SIG{__WARN__} // \&CORE::warn;
+               $SIG{__WARN__} = sub {
+                       $cb->(@_) unless PublicInbox::Eml::warn_ignore(@_)
+               };
+       }
        $current_lei = $persist ? undef : $self; # for SIG{__WARN__}
 }
 
@@ -1291,23 +1299,11 @@ sub lazy_start {
                USR1 => \&noop,
                USR2 => \&noop,
        };
-       my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
-       local @SIG{keys %$sig} = values(%$sig) unless $sigfd;
-       undef $sig;
-       local $SIG{PIPE} = 'IGNORE';
        require PublicInbox::DirIdle;
        local $dir_idle = PublicInbox::DirIdle->new([$sock_dir], sub {
                # just rely on wakeup to hit PostLoopCallback set below
                dir_idle_handler($_[0]) if $_[0]->fullname ne $path;
        }, 1);
-       if ($sigfd) {
-               undef $sigfd; # unref, already in DS::DescriptorMap
-       } else {
-               # wake up every second to accept signals if we don't
-               # have signalfd or IO::KQueue:
-               PublicInbox::DS::sig_setmask($oldset);
-               PublicInbox::DS->SetLoopTimeout(1000);
-       }
        PublicInbox::DS->SetPostLoopCallback(sub {
                my ($dmap, undef) = @_;
                if (@st = defined($path) ? stat($path) : ()) {
@@ -1344,7 +1340,7 @@ sub lazy_start {
        open STDERR, '>&STDIN' or die "redirect stderr failed: $!";
        open STDOUT, '>&STDIN' or die "redirect stdout failed: $!";
        # $daemon pipe to `lei' closed, main loop begins:
-       eval { PublicInbox::DS->EventLoop };
+       eval { PublicInbox::DS::event_loop($sig, $oldset) };
        warn "event loop error: $@\n" if $@;
        # exit() may trigger waitpid via various DESTROY, ensure interruptible
        PublicInbox::DS::sig_setmask($oldset);
@@ -1425,7 +1421,7 @@ sub refresh_watches {
                require PublicInbox::LeiWatch;
                $watches->{$url} //= PublicInbox::LeiWatch->new($url);
                $seen{$url} = undef;
-               my $state = $cfg->get_1("watch.$url", 'state');
+               my $state = $cfg->get_1("watch.$url.state");
                if (!watch_state_ok($state)) {
                        $lei->err("watch.$url.state=$state not supported");
                        next;