Merge remote-tracking branch 'origin/master' into lorelei

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

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 953228d0287823ea691e461fb5fae5b86f8c6e99..6907a03cc4ed37e9ebb9582633b9c3169d35a5a7 100644 (file)
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -36,10 +36,12 @@ sub refresh_groups {
        my ($self, $sig) = @_;
        my $pi_cfg = $sig ? PublicInbox::Config->new : $self->{pi_cfg};
        my $groups = $pi_cfg->{-by_newsgroup}; # filled during each_inbox
+       my $cache = eval { $pi_cfg->ALL->misc->nntpd_cache_load } // {};
        $pi_cfg->each_inbox(sub {
                my ($ibx) = @_;
-               my $ngname = $ibx->{newsgroup};
-               if (defined($ngname) && $ibx->nntp_usable) {
+               my $ngname = $ibx->{newsgroup} // return;
+               my $ce = $cache->{$ngname};
+               if (($ce and (%$ibx = (%$ibx, %$ce))) || $ibx->nntp_usable) {
                        # only valid if msgmap and over works
                        # preload to avoid fragmentation:
                        $ibx->description;