]> Sergey Matveev's repositories - public-inbox.git/commitdiff
netd: load modules for well-known ports
authorEric Wong <e@80x24.org>
Wed, 20 Jul 2022 01:22:04 +0000 (01:22 +0000)
committerEric Wong <e@80x24.org>
Wed, 20 Jul 2022 03:54:29 +0000 (03:54 +0000)
When inheriting well-known ports from systemd (or similar),
we can auto-load the proper *D.pm file based on the port number
without requiring command-line args.

load_mod also gets fixed to use its argument, instead of implicit
$1 since that won't work for our well-known.

lib/PublicInbox/Daemon.pm

index d08ce0f9a4148905e05b5b8321afeb9a12552350..75719c3413276ddd8abe276565daa4bf30a80b2d 100644 (file)
@@ -77,7 +77,7 @@ sub accept_tls_opt ($) {
 
 sub load_mod ($) {
        my ($scheme) = @_;
-       my $modc = "PublicInbox::\U$1";
+       my $modc = "PublicInbox::\U$scheme";
        my $mod = $modc.'D';
        eval "require $mod"; # IMAPD|HTTPD|NNTPD|POP3D
        die $@ if $@;
@@ -204,8 +204,10 @@ 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));
                        $tls_opt{"$scheme://$sockname"} ||= accept_tls_opt('');
                } elsif (($scheme = $KNOWN_STARTTLS{$1})) {
+                       $xnetd->{$sockname} = load_mod($scheme);
                        next if $tls_opt{"$scheme://$sockname"};
                        $tls_opt{''} ||= accept_tls_opt('');
                }