diff options
author | Eric Wong <e@80x24.org> | 2016-06-17 01:56:05 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-06-17 01:57:26 +0000 |
commit | 78d765a8d03967d0dfd6ce6232ffad5c89319909 (patch) | |
tree | 7d18fefbd3fcf72ca44133c5e3f96b2df2a7c489 | |
parent | 2f69c2938a9f6bd36740f050c9e2661206b17c34 (diff) | |
download | public-inbox-78d765a8d03967d0dfd6ce6232ffad5c89319909.tar.gz |
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.
-rw-r--r-- | lib/PublicInbox/Import.pm | 5 | ||||
-rwxr-xr-x | script/public-inbox-learn | 4 | ||||
-rwxr-xr-x | 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 e3d65f4a..c13d4834 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 817fd5e9..b05ef056 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 26b70cfb..145aa710 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; - }; -} |