user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [PATCH] import: auto-update index when done
@ 2016-06-17  1:59  7% Eric Wong
  0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2016-06-17  1:59 UTC (permalink / raw)
  To: meta

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;
-	};
-}

^ permalink raw reply related	[relevance 7%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-06-17  1:59  7% [PATCH] import: auto-update index when done Eric Wong

Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).