From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 88C521F8C6 for ; Thu, 9 Sep 2021 05:34:31 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei up: print messages before disconnecting Date: Thu, 9 Sep 2021 05:34:31 +0000 Message-Id: <20210909053431.6447-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Closing the socket for script/lei needs to be done AFTER the final message(s) are printed. --- lib/PublicInbox/LeiFinmsg.pm | 9 +++++---- lib/PublicInbox/LeiUp.pm | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/LeiFinmsg.pm b/lib/PublicInbox/LeiFinmsg.pm index 395e7d3c..7ed58c24 100644 --- a/lib/PublicInbox/LeiFinmsg.pm +++ b/lib/PublicInbox/LeiFinmsg.pm @@ -8,14 +8,15 @@ use strict; use v5.10.1; sub new { - my ($cls, $io) = @_; - bless [ $io, $$ ], $cls; + my ($cls, $lei) = @_; + bless [ @$lei{qw(2 sock)}, $$ ], $cls; } sub DESTROY { my ($self) = @_; - my $io = shift @$self; - shift(@$self) == $$ and print $io @$self; + my ($stderr, $sock, $pid) = splice(@$self, 0, 3); + print $stderr @$self if $pid == $$; + # script/lei disconnects when $sock SvREFCNT drops to zero } 1; diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm index 30358e9d..be476427 100644 --- a/lib/PublicInbox/LeiUp.pm +++ b/lib/PublicInbox/LeiUp.pm @@ -73,7 +73,7 @@ sub up1_redispatch { sub redispatch_all ($$) { my ($self, $lei) = @_; # re-dispatch into our event loop w/o creating an extra fork-level - $lei->{fmsg} = PublicInbox::LeiFinmsg->new($lei->{2}); + $lei->{fmsg} = PublicInbox::LeiFinmsg->new($lei); my ($op_c, $op_p) = PublicInbox::PktOp->pair; for my $o (@{$self->{local} // []}, @{$self->{remote} // []}) { PublicInbox::DS::requeue(sub {