user/dev discussion of public-inbox itself
 help / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/2] import: hoist out common run_die subroutine
Date: Thu,  8 Sep 2016 22:46:50 +0000
Message-ID: <20160908224651.25346-2-e@80x24.org> (raw)
In-Reply-To: <20160908224651.25346-1-e@80x24.org>

We will be reusing this in the next commit, too.
---
 lib/PublicInbox/Import.pm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 09dd38d..083fb1b 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -204,6 +204,14 @@ sub add {
 	$self->{tip} = ":$commit";
 }
 
+sub run_die ($$) {
+	my ($cmd, $env) = @_;
+	my $pid = spawn($cmd, $env, undef);
+	defined $pid or die "spawning ".join(' ', @$cmd)." failed: $!";
+	waitpid($pid, 0) == $pid or die join(' ', @$cmd) .' did not finish';
+	$? == 0 or die join(' ', @$cmd) . " failed: $?\n";
+}
+
 sub done {
 	my ($self) = @_;
 	my $w = delete $self->{out} or return;
@@ -222,19 +230,10 @@ sub done {
 	if ($nchg && !$ENV{FAST}) {
 		my $index = "$git_dir/ssoma.index";
 		my $env = { GIT_INDEX_FILE => $index };
-		my @rt = (@cmd, qw(read-tree -m -v -i), $self->{ref});
-		$pid = spawn(\@rt, $env, undef);
-		defined $pid or die "spawn read-tree failed: $!";
-		waitpid($pid, 0) == $pid or die 'read-tree did not finish';
-		$? == 0 or die "failed to update $git_dir/ssoma.index: $?\n";
+		run_die([@cmd, qw(read-tree -m -v -i), $self->{ref}], $env);
 	}
 	if ($nchg) {
-		$pid = spawn([@cmd, 'update-server-info'], undef, undef);
-		defined $pid or die "spawn update-server-info failed: $!\n";
-		waitpid($pid, 0) == $pid or
-			die 'update-server-info did not finish';
-		$? == 0 or die "failed to update-server-info: $?\n";
-
+		run_die([@cmd, 'update-server-info'], undef);
 		eval {
 			require PublicInbox::SearchIdx;
 			my $inbox = $self->{inbox} || $git_dir;
-- 
EW


  reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-08 22:46 [PATCH 0/2] import: run "git gc --auto" Eric Wong
2016-09-08 22:46 ` Eric Wong [this message]
2016-09-08 22:46 ` [PATCH 2/2] import: run "git gc --auto" when done Eric Wong

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160908224651.25346-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox