From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 376FC1F9FC for ; Tue, 23 Mar 2021 06:51:41 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei: hide *_atfork_child from command-line Date: Tue, 23 Mar 2021 04:51:41 -0200 Message-Id: <20210323065141.22165-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Otherwise we could get non-sensical results if somebody tries running "lei atfork_child" from the command-line. --- lib/PublicInbox/LEI.pm | 2 +- lib/PublicInbox/LeiConvert.pm | 2 +- lib/PublicInbox/LeiInput.pm | 2 +- lib/PublicInbox/LeiMirror.pm | 2 +- lib/PublicInbox/LeiP2q.pm | 4 ++-- lib/PublicInbox/LeiStore.pm | 2 +- lib/PublicInbox/LeiToMail.pm | 2 +- lib/PublicInbox/LeiXSearch.pm | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 0be417eb..17ca637e 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -449,7 +449,7 @@ sub note_sigpipe { # triggers sigpipe_handler x_it($self, 13); } -sub lei_atfork_child { +sub _lei_atfork_child { my ($self, $persist) = @_; # we need to explicitly close things which are on stack if ($persist) { diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm index 51a233bd..49e2b7af 100644 --- a/lib/PublicInbox/LeiConvert.pm +++ b/lib/PublicInbox/LeiConvert.pm @@ -86,7 +86,7 @@ sub lei_convert { # the main "lei convert" method sub ipc_atfork_child { my ($self) = @_; my $lei = $self->{lei}; - $lei->lei_atfork_child; + $lei->_lei_atfork_child; my $l2m = delete $lei->{l2m}; if (my $net = $lei->{net}) { # may prompt user once $net->{mics_cached} = $net->imap_common_init($lei); diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm index 6ad57772..2a4968d4 100644 --- a/lib/PublicInbox/LeiInput.pm +++ b/lib/PublicInbox/LeiInput.pm @@ -106,7 +106,7 @@ sub prepare_inputs { # returns undef on error sub input_only_atfork_child { my ($self) = @_; my $lei = $self->{lei}; - $lei->lei_atfork_child; + $lei->_lei_atfork_child; PublicInbox::IPC::ipc_atfork_child($self); $lei->{auth}->do_auth_atfork($self) if $lei->{auth}; undef; diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index 65818796..c916f2d0 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -288,7 +288,7 @@ sub start { sub ipc_atfork_child { my ($self) = @_; - $self->{lei}->lei_atfork_child; + $self->{lei}->_lei_atfork_child; $SIG{TERM} = sub { exit(128 + 15) }; # trigger OnDestroy $reap $self->SUPER::ipc_atfork_child; } diff --git a/lib/PublicInbox/LeiP2q.pm b/lib/PublicInbox/LeiP2q.pm index 4abe1345..0f7ffb5f 100644 --- a/lib/PublicInbox/LeiP2q.pm +++ b/lib/PublicInbox/LeiP2q.pm @@ -178,7 +178,7 @@ sub lei_p2q { # the "lei patch-to-query" entry point my ($lei, $input) = @_; my $self = $lei->{p2q} = bless {}, __PACKAGE__; if ($lei->{opt}->{stdin}) { - $self->{0} = delete $lei->{0}; # guard from lei_atfork_child + $self->{0} = delete $lei->{0}; # guard from _lei_atfork_child } else { $self->{input} = $input; } @@ -191,7 +191,7 @@ sub lei_p2q { # the "lei patch-to-query" entry point sub ipc_atfork_child { my ($self) = @_; my $lei = $self->{lei}; - $lei->lei_atfork_child; + $lei->_lei_atfork_child; $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; } diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index b5d43b7e..fa03f93c 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -322,7 +322,7 @@ sub done { sub ipc_atfork_child { my ($self) = @_; my $lei = $self->{lei}; - $lei->lei_atfork_child(1) if $lei; + $lei->_lei_atfork_child(1) if $lei; $self->SUPER::ipc_atfork_child; } diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index e9ab939c..1be15707 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -636,7 +636,7 @@ sub do_post_auth { sub ipc_atfork_child { my ($self) = @_; my $lei = $self->{lei}; - $lei->lei_atfork_child; + $lei->_lei_atfork_child; $lei->{auth}->do_auth_atfork($self) if $lei->{auth}; $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index b6aaf3e1..c6b82eeb 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -401,7 +401,7 @@ sub incr_start_query { # called whenever an l2m shard starts do_post_auth sub ipc_atfork_child { my ($self) = @_; - $self->{lei}->lei_atfork_child; + $self->{lei}->_lei_atfork_child; $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; }