From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/2] watch: do not recreate signalfd on SIGHUP
Date: Sun, 26 Mar 2023 10:52:46 +0000 [thread overview]
Message-ID: <20230326105246.2159382-3-e@80x24.org> (raw)
In-Reply-To: <20230326105246.2159382-1-e@80x24.org>
The normal method by which PublicInbox::DS::event_loop sets up
signals once needs some coercing to work with -watch.
Otherwise, we'll end up wasting FDs every time somebody reloads
-watch via SIGHUP.
---
lib/PublicInbox/Watch.pm | 5 +++--
script/public-inbox-watch | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index 810fb63b..693c7181 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -528,7 +528,8 @@ sub watch_nntp_init ($$) {
sub watch { # main entry point
my ($self, $sig, $oldset) = @_;
$self->{oldset} = $oldset;
- $self->{sig} = $sig;
+ my $first_sig;
+ $self->{sig} //= ($first_sig = $sig);
my $poll = {}; # intvl_seconds => [ uri1, uri2 ]
watch_imap_init($self, $poll) if $self->{imap};
watch_nntp_init($self, $poll) if $self->{nntp};
@@ -538,7 +539,7 @@ sub watch { # main entry point
}
watch_fs_init($self) if $self->{mdre};
local @PublicInbox::DS::post_loop_do = (sub { !$self->quit_done });
- PublicInbox::DS::event_loop($sig, $oldset); # calls ->event_step
+ PublicInbox::DS::event_loop($first_sig, $oldset); # calls ->event_step
_done_for_now($self);
}
diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 4c50461f..2fb27343 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -27,6 +27,7 @@ my $reload = sub {
$watch->quit;
$watch = PublicInbox::Watch->new(PublicInbox::Config->new);
if ($watch) {
+ $watch->{sig} = $prev->{sig}; # prevent redundant signalfd
warn "# reloaded\n";
} else {
warn("E: reloading failed\n");
prev parent reply other threads:[~2023-03-26 10:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 10:52 [PATCH 0/2] public-inbox-watch fixes Eric Wong
2023-03-26 10:52 ` [PATCH 1/2] watch: avoid Mail::IMAPClient errors when disconnected Eric Wong
2023-03-26 10:52 ` Eric Wong [this message]
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=20230326105246.2159382-3-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).