daemon: do more immortal allocations up front

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

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 85109ea7ed57b722d8822c51339635c4b8ca6649..451f4d4183bf52875e5f3e800f269c331ccffa14 100644 (file)
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # represents an NNTPD (currently a singleton),
@@ -6,16 +6,27 @@
 package PublicInbox::NNTPD;
 use strict;
 use warnings;
-require PublicInbox::NewsGroup;
-require PublicInbox::Config;
+use Sys::Hostname;
+use PublicInbox::Config;
 
 sub new {
        my ($class) = @_;
+       my $pi_config = PublicInbox::Config->new;
+       my $name = $pi_config->{'publicinbox.nntpserver'};
+       if (!defined($name) or $name eq '') {
+               $name = hostname;
+       } elsif (ref($name) eq 'ARRAY') {
+               $name = $name->[0];
+       }
+
        bless {
                groups => {},
                err => \*STDERR,
                out => \*STDOUT,
                grouplist => [],
+               servername => $name,
+               greet => \"201 $name ready - post via email\r\n",
+               # accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... }
        }, $class;
 }
 
@@ -24,33 +35,23 @@ sub refresh_groups () {
        my $pi_config = PublicInbox::Config->new;
        my $new = {};
        my @list;
-       foreach my $k (keys %$pi_config) {
-               $k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
-               my $g = $1;
-               my $git_dir = $pi_config->{$k};
-               my $addr = $pi_config->{"publicinbox.$g.address"};
-               my $ngname = $pi_config->{"publicinbox.$g.newsgroup"};
-               if (defined $ngname) {
-                       next if ($ngname eq ''); # disabled
-                       $g = $ngname;
-               }
-               my $ng = PublicInbox::NewsGroup->new($g, $git_dir, $addr);
-               my $old_ng = $self->{groups}->{$g};
-
-               # Reuse the old one if possible since it can hold
-               # references to valid mm and gcf objects
-               if ($old_ng) {
-                       $old_ng->update($ng);
-                       $ng = $old_ng;
-               }
-
-               # Only valid if msgmap and search works
-               if ($ng->usable) {
-                       $new->{$g} = $ng;
+       $pi_config->each_inbox(sub {
+               my ($ng) = @_;
+               my $ngname = $ng->{newsgroup} or return;
+               if (ref $ngname) {
+                       warn 'multiple newsgroups not supported: '.
+                               join(', ', @$ngname). "\n";
+               } elsif ($ng->nntp_usable) {
+                       # Only valid if msgmap and search works
+                       $new->{$ngname} = $ng;
                        push @list, $ng;
+
+                       # preload to avoid fragmentation:
+                       $ng->description;
+                       $ng->base_url;
                }
-       }
-       @list = sort { $a->{name} cmp $b->{name} } @list;
+       });
+       @list = sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
        $self->{grouplist} = \@list;
        # this will destroy old groups that got deleted
        %{$self->{groups}} = %$new;