From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
	autolearn=ham autolearn_force=no version=3.4.6
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id BEEB51FA34
	for <meta@public-inbox.org>; Tue, 17 Jan 2023 07:19:12 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org;
	s=selector1; t=1673939952;
	bh=ugTUIrDVoQ64BRKzROnwro8mv356ewehCrp4djFuQQk=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=yv2I1oHHu/vSNgSz0pfjPuJnsjmXOjMbtCNrJkdv/ACwPDv8gwC8/3Aleq7stLnXF
	 eDRn+vQKaOOP55/EGGMHtCxVHnuysL4K1v5gsiPfFW7K0740REAYE0NpLFqs9yfocr
	 D13OemHBulaJ+70+l5Z0x7o5/q5XI4zafWuAJAgQ=
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 09/12] watch: IMAP and NNTP polling can use the same interval
Date: Tue, 17 Jan 2023 07:19:08 +0000
Message-Id: <20230117071911.1577890-10-e@80x24.org>
In-Reply-To: <20230117071911.1577890-1-e@80x24.org>
References: <20230117071911.1577890-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

An obvious error :x
---
 lib/PublicInbox/Watch.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index 66b0c8b1..90d82d21 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -464,17 +464,18 @@ sub poll_fetch_fork { # DS::add_timer callback
 	my ($self, $intvl, $uris) = @_;
 	return if $self->{quit};
 	watch_atfork_parent($self);
+	my @nntp;
+	my @imap = grep { # push() always returns > 0
+		$_->scheme =~ m!\Aimaps?!i ? 1 : (push(@nntp, $_) < 0)
+	} @$uris;
 	my $seed = rand(0xffffffff);
 	my $pid = fork // die "fork: $!";
 	if ($pid == 0) {
 		srand($seed);
 		eval { Net::SSLeay::randomize() };
 		watch_atfork_child($self);
-		if ($uris->[0]->scheme =~ m!\Aimaps?!i) {
-			watch_imap_fetch_all($self, $uris);
-		} else {
-			watch_nntp_fetch_all($self, $uris);
-		}
+		watch_imap_fetch_all($self, \@imap) if @imap;
+		watch_nntp_fetch_all($self, \@nntp) if @nntp;
 		_exit(0);
 	}
 	$self->{pids}->{$pid} = undef;