From be365fb4bd3eda10294d4a916321c28b90dd723d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 9 Jun 2021 20:27:50 -0300 Subject: lei tag: less confusing warning about unimported messages "unimported" is more meaningful than "missing", here. And instead of having every worker spew about unimported messages, we'll accumulate and only print one warning line. This necessitated alterating ->DESTROY behavior and persisting the client socket within the $lei object itself, not just the PktOp consumer object. --- lib/PublicInbox/LeiTag.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/PublicInbox/LeiTag.pm') diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm index e0532653..463fb921 100644 --- a/lib/PublicInbox/LeiTag.pm +++ b/lib/PublicInbox/LeiTag.pm @@ -15,7 +15,7 @@ sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh $self->{lei}->{sto}->ipc_do('update_xvmd', $xoids, $eml, $self->{vmd_mod}); } else { - ++$self->{missing}; + ++$self->{unimported}; } } @@ -40,7 +40,7 @@ sub lei_tag { # the "lei tag" method my ($lei, @argv) = @_; my $sto = $lei->_lei_store(1); $sto->write_prepare($lei); - my $self = bless { missing => 0 }, __PACKAGE__; + my $self = bless {}, __PACKAGE__; $lei->ale; # refresh and prepare my $vmd_mod = $self->vmd_mod_extract(\@argv); return $lei->fail(join("\n", @{$vmd_mod->{err}})) if $vmd_mod->{err}; @@ -58,10 +58,10 @@ sub lei_tag { # the "lei tag" method $lei->wait_wq_events($op_c, $ops); } -sub note_missing { +sub note_unimported { my ($self) = @_; - my $n = $self->{missing} or return; - $self->{lei}->child_error(1 << 8, "$n missed messages"); + my $n = $self->{unimported} or return; + $self->{lei}->{pkt_op_p}->pkt_do('incr', 'unimported', $n); } sub ipc_atfork_child { @@ -69,7 +69,7 @@ sub ipc_atfork_child { PublicInbox::LeiInput::input_only_atfork_child($self); $self->{lse} = $self->{lei}->{sto}->search; # this goes out-of-scope at worker process exit: - PublicInbox::OnDestroy->new($$, \¬e_missing, $self); + PublicInbox::OnDestroy->new($$, \¬e_unimported, $self); } # Workaround bash word-splitting s to ['kw', ':', 'keyword' ...] -- cgit v1.2.3-24-ge0c7