daemon: share FDs for identical log paths

[public-inbox.git] / lib / PublicInbox / Daemon.pm

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 87a359e768d24b11698b0c239217d4324242dc38..20b07b83997aa90d3e196d4b94e107d591d931b7 100644 (file)
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -35,6 +35,9 @@ my ($uid, $gid);
 my ($default_cert, $default_key);
 my %KNOWN_TLS = (443 => 'https', 563 => 'nntps', 993 => 'imaps', 995 =>'pop3s');
 my %KNOWN_STARTTLS = (110 => 'pop3', 119 => 'nntp', 143 => 'imap');
+my %SCHEME2PORT = map { $KNOWN_TLS{$_} => $_ + 0 } keys %KNOWN_TLS;
+for (keys %KNOWN_STARTTLS) { $SCHEME2PORT{$KNOWN_STARTTLS{$_}} = $_ + 0 }
+$SCHEME2PORT{http} = 80;
 
 sub listener_opt ($) {
        my ($str) = @_; # opt1=val1,opt2=val2 (opt may repeat for multi-value)
@@ -101,11 +104,13 @@ 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 ($;$) {
-       my ($scheme, $opt) = @_;
+sub load_mod ($;$$) {
+       my ($scheme, $opt, $addr) = @_;
        my $modc = "PublicInbox::\U$scheme";
+       $modc =~ s/S\z//;
        my $mod = $modc.'D';
        eval "require $mod"; # IMAPD|HTTPD|NNTPD|POP3D
        die $@ if $@;
@@ -129,6 +134,7 @@ sub load_mod ($;$) {
                        die "multiple psgi= options specified\n" if @$p > 1;
                        check_absolute('psgi=', $p->[0]) if $daemonize;
                        $tlsd->{psgi} = $p->[0];
+                       warn "# $scheme://$addr psgi=$p->[0]\n";
                }
        }
        for my $f (@paths) {
@@ -136,8 +142,8 @@ 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;
 }
@@ -198,11 +204,17 @@ EOF
        foreach my $l (@cfg_listen) {
                my $orig = $l;
                my $scheme = '';
-               if ($l =~ s!\A([^:]+)://!!) {
-                       $scheme = $1;
-               } elsif ($l =~ /\A(?:\[[^\]]+\]|[^:]+):([0-9])+/) {
-                       my $s = $KNOWN_TLS{$1} // $KNOWN_STARTTLS{$1};
-                       $scheme = $s if defined $s;
+               my $port;
+               if ($l =~ s!\A([^:]+)://!!) { $scheme = $1 }
+               if ($l =~ /\A(?:\[[^\]]+\]|[^:]+):([0-9]+)/) {
+                       $port = $1 + 0;
+                       my $s = $KNOWN_TLS{$port} // $KNOWN_STARTTLS{$port};
+                       $scheme //= $s if defined $s;
+               } elsif (index($l, '/') != 0) { # unix socket
+                       $port //= $SCHEME2PORT{$scheme} if $scheme;
+                       $port // die "no port in listen=$l\n";
+                       $l =~ s!\A([^/]+)!$1:$port! or
+                               die "unable to add port=$port to $l\n";
                }
                my $opt; # non-TLS options
                if ($l =~ s!/?\?(.+)\z!!) {
@@ -213,8 +225,8 @@ EOF
                } elsif ($scheme =~ /\A(?:https|imaps|nntps|pop3s)\z/) {
                        die "$orig specified w/o cert=\n";
                }
-               $scheme =~ /\A(http|imap|nntp|pop3)/ and
-                       $xnetd->{$l} = load_mod($1, $opt);
+               $scheme =~ /\A(?:http|imap|nntp|pop3)/ and
+                       $xnetd->{$l} = load_mod($scheme, $opt, $l);
 
                next if $listener_names->{$l}; # already inherited
                my (%o, $sock_pkg);
@@ -247,8 +259,10 @@ EOF
                warn "error binding $l: $! ($@)\n" unless $s;
                umask $prev;
                if ($s) {
-                       $listener_names->{sockname($s)} = $s;
                        $s->blocking(0);
+                       my $k = sockname($s);
+                       warn "# bound $scheme://$k\n";
+                       $listener_names->{$k} = $s;
                        push @listeners, $s;
                }
        }
@@ -259,7 +273,7 @@ EOF
        for my $sockname (@inherited_names) {
                $sockname =~ /:([0-9]+)\z/ or next;
                if (my $scheme = $KNOWN_TLS{$1}) {
-                       $xnetd->{$sockname} = load_mod(substr($scheme, 0, -1));
+                       $xnetd->{$sockname} = load_mod($scheme);
                        $tls_opt{"$scheme://$sockname"} ||= accept_tls_opt('');
                } elsif (($scheme = $KNOWN_STARTTLS{$1})) {
                        $xnetd->{$sockname} = load_mod($scheme);
@@ -434,11 +448,12 @@ sub inherit ($) {
                if (my $k = sockname($s)) {
                        my $prev_was_blocking = $s->blocking(0);
                        warn <<"" if $prev_was_blocking;
-Inherited socket (fd=$fd) is blocking, making it non-blocking.
+Inherited socket ($k fd=$fd) is blocking, making it non-blocking.
 Set 'NonBlocking = true' in the systemd.service unit to avoid stalled
 processes when multiple service instances start.
 
                        $listener_names->{$k} = $s;
+                       warn "# inherited $k fd=$fd\n";
                        push @rv, $s;
                } else {
                        warn "failed to inherit fd=$fd (LISTEN_FDS=$fds)";