From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2E3DB1F8C4; Sun, 7 Feb 2021 09:32:18 +0000 (UTC) Date: Sat, 6 Feb 2021 23:32:18 -1000 From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 20/19] lei_xsearch: allow quieting regular mset progress, too Message-ID: <20210207093218.GA14383@dcvr> References: <20210207085201.13871-1-e@80x24.org> <20210207085201.13871-16-e@80x24.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210207085201.13871-16-e@80x24.org> List-Id: And actually wait for startq when using --threads/-t. Some of this is tricky to test in an automated way, unfortunately :/ --- lib/PublicInbox/LeiXSearch.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index a7668a17..8a863cb6 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -128,7 +128,7 @@ sub mset_progress { } else { # single lei-daemon consumer my ($desc, $mset_size, $mset_total_est) = @_; $lei->{-mset_total} += $mset_size; - $lei->err("# $desc $mset_size/$mset_total_est"); + $lei->qerr("# $desc $mset_size/$mset_total_est"); } } @@ -136,7 +136,6 @@ sub query_thread_mset { # for --threads my ($self, $ibxish) = @_; local $0 = "$0 query_thread_mset"; my $lei = $self->{lei}; - my $startq = delete $lei->{startq}; my ($srch, $over) = ($ibxish->search, $ibxish->over); my $desc = $ibxish->{inboxdir} // $ibxish->{topdir}; return warn("$desc not indexed by Xapian\n") unless ($srch && $over);