From 3b9157689728eb396891cc32f3fdc038562b7f3d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 7 Jul 2021 23:24:55 +0000 Subject: extsearchidx: ignore Eml warnings across the board There's nothing we can do about misformatted emails and headers we get from untrusted sources. They're too noisy and those messages already exist in public-inboxes, anyways, so just keep things quiet so we can spot real problems more easily. --- lib/PublicInbox/ExtSearchIdx.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm index 495579a2..a421e16b 100644 --- a/lib/PublicInbox/ExtSearchIdx.pm +++ b/lib/PublicInbox/ExtSearchIdx.pm @@ -891,10 +891,6 @@ SELECT DISTINCT(mid),id FROM msgid WHERE id IN ORDER BY id EOS $iter->execute($min_id); - local $SIG{__WARN__} = sub { - return if PublicInbox::Eml::warn_ignore(@_); - warn @_; - }; while (my ($mid, $id) = $iter->fetchrow_array) { last if $sync->{quit}; $self->{current_info} = "dedupe $mid"; @@ -942,6 +938,7 @@ sub eidx_sync { # main entry point my $warn_cb = $SIG{__WARN__} || \&CORE::warn; local $self->{current_info} = ''; local $SIG{__WARN__} = sub { + return if PublicInbox::Eml::warn_ignore(@_); $warn_cb->($self->{current_info}, ': ', @_); }; $self->idx_init($opt); # acquire lock via V2Writable::_idx_init @@ -1238,7 +1235,10 @@ sub eidx_watch { # public-inbox-extindex --watch main loop my $oldset = PublicInbox::DS::block_signals(); local $self->{current_info} = ''; my $cb = $SIG{__WARN__} || \&CORE::warn; - local $SIG{__WARN__} = sub { $cb->($self->{current_info}, ': ', @_) }; + local $SIG{__WARN__} = sub { + return if PublicInbox::Eml::warn_ignore(@_); + $cb->($self->{current_info}, ': ', @_); + }; my $sig = { HUP => sub { eidx_reload($self, $idler) }, USR1 => sub { eidx_resync_start($self) }, -- cgit v1.2.3-24-ge0c7