X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FQspawn.pm;h=3425e5e4558ba3911d0979ab01ea534c47434f86;hb=fb0afdaa35d778c237c40b10216c38e360b248b3;hp=1a2b70e7b442e8a2373ebd2ae207d6555a6bab9e;hpb=a7949988f7f8690c868d2150fe3000fcf6a6d5f4;p=public-inbox.git

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 1a2b70e7..3425e5e4 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -45,27 +45,28 @@ sub new ($$$;) {
 sub _do_spawn {
 	my ($self, $start_cb, $limiter) = @_;
 	my $err;
-	my ($cmd, $cmd_env, $opts) = @{$self->{args}};
-	my %opts = %{$opts || {}};
+	my ($cmd, $cmd_env, $opt) = @{$self->{args}};
+	my %o = %{$opt || {}};
 	$self->{limiter} = $limiter;
 	foreach my $k (PublicInbox::Spawn::RLIMITS()) {
 		if (defined(my $rlimit = $limiter->{$k})) {
-			$opts{$k} = $rlimit;
+			$o{$k} = $rlimit;
 		}
 	}
+	eval {
+		# popen_rd may die on EMFILE, ENFILE
+		($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%o);
+		$self->{args} = $o{quiet} ? undef : $cmd;
 
-	($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%opts);
+		die "E: $!" unless defined($self->{pid});
 
-	# drop any IO handles opt was holding open via $opt->{hold}
-	# No need to hold onto the descriptor once the child process has it.
-	$self->{args} = $cmd; # keep this around for logging
-
-	if (defined $self->{pid}) {
 		$limiter->{running}++;
-	} else {
-		$self->{err} = $!;
+		$start_cb->($self); # EPOLL_CTL_ADD may ENOSPC/ENOMEM
+	};
+	if ($@) {
+		$self->{err} = $@;
+		finish($self);
 	}
-	$start_cb->($self);
 }
 
 sub child_err ($) {
@@ -107,8 +108,12 @@ sub waitpid_err ($$) {
 	}
 
 	if ($err) {
-		$self->{err} = $err;
-		if ($env && !$env->{'qspawn.quiet'}) {
+		if ($self->{err}) {
+			$self->{err} .= "; $err";
+		} else {
+			$self->{err} = $err;
+		}
+		if ($env && $self->{args}) {
 			log_err($env, join(' ', @{$self->{args}}) . ": $err");
 		}
 	}
@@ -159,7 +164,7 @@ reread:
 		$async->async_pass($self->{psgi_env}->{'psgix.io'},
 					$qx_fh, \$buf);
 	} elsif (defined $r) {
-		$r ? $qx_fh->write($buf) : event_step($self, undef);
+		$r ? (print $qx_fh $buf) : event_step($self, undef);
 	} else {
 		return if $! == EAGAIN; # try again when notified
 		goto reread if $! == EINTR;