]> Sergey Matveev's repositories - public-inbox.git/commitdiff
nntp: clear local timer on idle client expiry
authorEric Wong <e@80x24.org>
Fri, 12 Jul 2019 00:03:41 +0000 (00:03 +0000)
committerEric Wong <e@80x24.org>
Fri, 12 Jul 2019 00:04:11 +0000 (00:04 +0000)
We need to ensure further timers can be registered if there's
currently no idle clients.

lib/PublicInbox/NNTP.pm

index f4208f878d9cd7e8a091609b25f22badfd001f65..0d2bc4f33d8b46f471e12b8fcaf3d17074bf4533 100644 (file)
@@ -57,22 +57,20 @@ sub expire_old () {
        my $now = now();
        my $exp = $EXPTIME;
        my $old = $now - $exp;
-       my $nr = 0;
        my %new;
        while (my ($fd, $v) = each %$EXPMAP) {
                my ($idle_time, $nntp) = @$v;
                if ($idle_time < $old) {
                        if (!$nntp->shutdn) {
-                               ++$nr;
                                $new{$fd} = $v;
                        }
                } else {
-                       ++$nr;
                        $new{$fd} = $v;
                }
        }
        $EXPMAP = \%new;
-       $expt = PublicInbox::EvCleanup::later(*expire_old) if $nr;
+       $expt = scalar(keys %new) ? PublicInbox::EvCleanup::later(*expire_old)
+                                 : undef;
 }
 
 sub greet ($) { $_[0]->write($_[0]->{nntpd}->{greet}) };