From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3B6BE1FF40 for ; Fri, 17 Jun 2016 01:59:06 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] import: auto-update index when done Date: Fri, 17 Jun 2016 01:59:06 +0000 Message-Id: <20160617015906.20948-1-e@80x24.org> List-Id: This prevents multiple update processes from stepping over each other while called under the lock, and also allows the new -watch process to update the index iff indexing was desired. --- lib/PublicInbox/Import.pm | 5 +++++ script/public-inbox-learn | 4 ---- script/public-inbox-mda | 9 --------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index e3d65f4..c13d483 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -226,6 +226,11 @@ sub done { waitpid($pid, 0) == $pid or die 'update-server-info did not finish'; $? == 0 or die "failed to update-server-info: $?\n"; + + eval { + require PublicInbox::SearchIdx; + PublicInbox::SearchIdx->new($git_dir, 2)->index_sync; + }; } my $lockfh = delete $self->{lockfh} or die "BUG: not locked: $!"; diff --git a/script/public-inbox-learn b/script/public-inbox-learn index 817fd5e..b05ef05 100755 --- a/script/public-inbox-learn +++ b/script/public-inbox-learn @@ -84,10 +84,6 @@ foreach my $recipient (keys %dests) { $im->add($mime); } $im->done; - eval { - require PublicInbox::SearchIdx; - PublicInbox::SearchIdx->new($git_dir, 2)->index_sync; - }; } if ($err) { diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 26b70cf..145aa71 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -79,7 +79,6 @@ if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message } # else { accept PublicInbox::MDA->set_list_headers($mime, $dst); -END { index_sync($main_repo) if $? == 0 }; my $git = PublicInbox::Git->new($main_repo); my $im = PublicInbox::Import->new($git, $dst->{name}, $recipient); if (defined $im->add($mime)) { @@ -107,11 +106,3 @@ sub do_spamc { ($? || $$out eq '') ? 0 : 1; } - -sub index_sync { - my ($git_dir) = @_; - eval { - require PublicInbox::SearchIdx; - PublicInbox::SearchIdx->new($git_dir, 2)->index_sync; - }; -}