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 {
--
unsubscribe: one-click, see List-Unsubscribe header
archive: https://public-inbox.org/meta/
