lib/PublicInbox/LEI.pm | 3 +++ lib/PublicInbox/LeiBlob.pm | 1 - lib/PublicInbox/LeiConvert.pm | 1 - lib/PublicInbox/LeiImport.pm | 1 + lib/PublicInbox/LeiP2q.pm | 4 +--- lib/PublicInbox/LeiStore.pm | 1 - lib/PublicInbox/LeiXSearch.pm | 1 - diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index a949ae3e7c39175ed7d07c76f55ee1f1c6e19198..cfbf12f00f2bebbc73c115c0aebb775513f03f23 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -23,6 +23,7 @@ use PublicInbox::Sigfd; use PublicInbox::DS qw(now dwaitpid); use PublicInbox::Spawn qw(spawn popen_rd); use PublicInbox::Lock; +use PublicInbox::Eml; use Time::HiRes qw(stat); # ctime comparisons for config cache use File::Path qw(mkpath); use File::Spec; @@ -509,6 +510,8 @@ undef $listener; %PATH2CFG = (); undef $errors_log; $quit = \&CORE::exit; + $self->{-eml_noisy} or # only "lei import" sets this atm + $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $current_lei = $persist ? undef : $self; # for SIG{__WARN__} } diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm index 0b96bd04cef553196d9f6e2b2227349c6c934907..ff079e6584413d7b54aefba64cc2ca793f7ff2e1 100644 --- a/lib/PublicInbox/LeiBlob.pm +++ b/lib/PublicInbox/LeiBlob.pm @@ -167,7 +167,6 @@ sub ipc_atfork_child { my ($self) = @_; $self->{lei}->_lei_atfork_child; - $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; } diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm index 0c3241694f70d525fe7300a7eddced06c77012f6..14bed901f75fe5a67315c3fe98a79d466633215b 100644 --- a/lib/PublicInbox/LeiConvert.pm +++ b/lib/PublicInbox/LeiConvert.pm @@ -68,7 +68,6 @@ if (my $net = $lei->{net}) { # may prompt user once $net->{mics_cached} = $net->imap_common_init($lei); $net->{nn_cached} = $net->nntp_common_init($lei); } - $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $l2m->pre_augment($lei); $l2m->do_augment($lei); $l2m->post_augment($lei); diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index e0d899cc0a015437a815a89015464b2f206e0e48..f2a0c95a27ab99dbba1bac42705be5f0ebc29023 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -93,6 +93,7 @@ } my $ops = {}; $lei->{auth}->op_merge($ops, $self) if $lei->{auth}; $self->{-wq_nr_workers} = $j // 1; # locked + $lei->{-eml_noisy} = 1; (my $op_c, $ops) = $lei->workers_start($self, 'lei-import', $j, $ops); $lei->{imp} = $self; net_merge_complete($self) unless $lei->{auth}; diff --git a/lib/PublicInbox/LeiP2q.pm b/lib/PublicInbox/LeiP2q.pm index 07357e32106ac5ab7aaf3b3c029975ce624468ec..deb3197483fd2186a3e75028d36b86d474d5cab0 100644 --- a/lib/PublicInbox/LeiP2q.pm +++ b/lib/PublicInbox/LeiP2q.pm @@ -197,9 +197,7 @@ } sub ipc_atfork_child { my ($self) = @_; - my $lei = $self->{lei}; - $lei->_lei_atfork_child; - $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); + $self->{lei}->_lei_atfork_child; $self->SUPER::ipc_atfork_child; } diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index 1cf7ffc1d206428ecb4b594620cb41a918465053..fcc9224d4644d7c2c6d97a96a99128155539c329 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -411,7 +411,6 @@ if (my $err = delete($self->{err_pipe})) { close $err->[0]; $self->{-err_wr} = $err->[1]; } - $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; } diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 018b60f965648fb93025a99ef6a2af0d1956bdb2..b3fd79d005c9ad00954c6d6e9b5edfce4e653c3d 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -443,7 +443,6 @@ sub ipc_atfork_child { my ($self) = @_; $self->{lei}->_lei_atfork_child; - $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; }