unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 6/6] daemon: share FDs for identical log paths
Date: Mon,  1 Aug 2022 21:24:47 +0000	[thread overview]
Message-ID: <20220801212447.270000-7-e@80x24.org> (raw)
In-Reply-To: <20220801212447.270000-1-e@80x24.org>

We rely on the %logs hash for SIGUSR1 log reopening.  Without this sharing,
some FDs would be hidden inside its respective {HTTP,IMAP,POP3}D
object and not reopened on USR2
---
 lib/PublicInbox/Daemon.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index ead5afc0..20b07b83 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -104,6 +104,7 @@ sub open_log_path ($$) { # my ($fh, $path) = @_; # $_[0] is modified
 	open $_[0], '>>', $_[1] or die "open(>> $_[1]): $!";
 	$_[0]->autoflush(1);
 	do_chown($_[1]);
+	$_[0];
 }
 
 sub load_mod ($;$$) {
@@ -141,8 +142,7 @@ sub load_mod ($;$$) {
 		die "multiple $f= options specified\n" if @$p > 1;
 		check_absolute("$f=", $p->[0]) if $daemonize;
 		$p = File::Spec->canonpath($p->[0]);
-		open_log_path(my $fh, $p);
-		$tlsd->{$f} = $logs{$p} = $fh;
+		$tlsd->{$f} = $logs{$p} //= open_log_path(my $fh, $p);
 		warn "# $scheme://$addr $f=$p\n";
 	}
 	\%xn;

      parent reply	other threads:[~2022-08-01 21:24 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-01 21:24 [PATCH 0/6] flesh out more -netd funcionality Eric Wong
2022-08-01 21:24 ` [PATCH 1/6] httpd: make internals slightly more generic Eric Wong
2022-08-01 21:24 ` [PATCH 2/6] daemon: support per-listener env, .psgi, out, err Eric Wong
2022-08-01 21:24 ` [PATCH 3/6] daemon: require absolute cert/key paths with --daemonize Eric Wong
2022-08-01 21:24 ` [PATCH 4/6] daemon: add diagnostics about inherited/bound listeners Eric Wong
2022-08-01 21:24 ` [PATCH 5/6] daemon: allow listening on well-known ports based on protocol Eric Wong
2022-08-01 21:24 ` 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=20220801212447.270000-7-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).