From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id AAE881F566 for ; Fri, 8 Sep 2023 10:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1694170275; bh=tJz0Jpjw2+8REreoV5txQRFK59mOoaJlw4aBAn6nKJs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=L1TYhIOxf5Asl+YJxyYQBpZDUzgkV5knpFuhUq96sETQIxMVQOsMf5IK1FM7i/RYU 64ljqjcQ2ghM7oopEkrjGXJpGp2O/UpHstawollJlz9zpZ4GZVYNhxfDkBC35qUqs6 fEw/mDPj4FFjD79x0220GAlf+HU5ZbvxZ6JhHPJE= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/3] watch: reset HUP + USR1 signal handlers in children Date: Fri, 8 Sep 2023 10:51:15 +0000 Message-ID: <20230908105115.2261125-4-e@80x24.org> In-Reply-To: <20230908105115.2261125-1-e@80x24.org> References: <20230908105115.2261125-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Child processes handling IMAP/NNTP aren't going to want to handle config reloads nor forced rescans, those are exclusively for the parent. We'll leave a note that QUIT/TERM/INT can safely use the same callback for both parent and children, as I nearly made the mistake of resetting those to their default values in the child. --- lib/PublicInbox/Watch.pm | 7 ++++--- script/public-inbox-watch | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm index a2dc125f..cf0720e3 100644 --- a/lib/PublicInbox/Watch.pm +++ b/lib/PublicInbox/Watch.pm @@ -250,7 +250,7 @@ sub quit_done ($) { $live == 0; } -sub quit { +sub quit { # may be called in IMAP/NNTP children my ($self) = @_; $self->{quit} = 1; %{$self->{opendirs}} = (); @@ -260,7 +260,7 @@ sub quit { my $di = $PublicInbox::DS::DescriptorMap{$fd}; $di->close if $di && $di->can('add_watches'); } - if (my $idle_mic = delete $self->{idle_mic}) { + if (my $idle_mic = delete $self->{idle_mic}) { # IMAP child return unless $idle_mic->IsConnected && $idle_mic->Socket; eval { $idle_mic->done }; if ($@ && $idle_mic->IsConnected && $idle_mic->Socket) { @@ -387,7 +387,8 @@ sub watch_atfork_child ($) { delete $self->{opendirs}; PublicInbox::DS->Reset; my $sig = delete $self->{sig}; - $sig->{CHLD} = 'DEFAULT'; + $sig->{CHLD} = $sig->{HUP} = $sig->{USR1} = 'DEFAULT'; + # TERM/QUIT/INT call ->quit, which works in both parent+child @SIG{keys %$sig} = values %$sig; PublicInbox::DS::sig_setmask(PublicInbox::DS::allowset($sig)); } diff --git a/script/public-inbox-watch b/script/public-inbox-watch index 870cd31b..d9215de9 100755 --- a/script/public-inbox-watch +++ b/script/public-inbox-watch @@ -41,7 +41,7 @@ if ($watch) { warn "# scanning\n"; $watch->trigger_scan('full'); }; - my $quit = sub { + my $quit = sub { # may be called in IMAP/NNTP children $watch->quit if $watch; $watch = undef; $0 .= ' quitting';