lei up: print messages before disconnecting

Closing the socket for script/lei needs to be done AFTER the
final message(s) are printed.

diff --git a/lib/PublicInbox/LeiFinmsg.pm b/lib/PublicInbox/LeiFinmsg.pm
index 395e7d3c7083037b4fbf6e62c67265e09c9b6685..7ed58c247696e5c044f0725b8696c5ca562aa753 100644 (file)
--- 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 30358e9da0fc96e0f93f86e8812861a7ba377813..be476427bc64f4598c0c6a2dc104d5cf9dde244f 100644 (file)
--- 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 {