From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei up: print messages before disconnecting
Date: Thu, 9 Sep 2021 05:34:31 +0000 [thread overview]
Message-ID: <20210909053431.6447-1-e@80x24.org> (raw)
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 {
reply other threads:[~2021-09-09 5:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210909053431.6447-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).