X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FQspawn.pm;h=53d0ad55ee84d47ccc10bd2d7516136fd38207e8;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=7e50a59ae49e1e65a67b16bf34109288a17694c8;hpb=22e51bd9da476fa9f4d72d4ec25ed0ec4a1f636f;p=public-inbox.git

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 7e50a59a..53d0ad55 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -12,7 +12,7 @@
 # operate in.  This can be useful to ensure smaller inboxes can
 # be cloned while cloning of large inboxes is maxed out.
 #
-# This does not depend on the PublicInbox::DS->EventLoop or any
+# This does not depend on the PublicInbox::DS::event_loop or any
 # other external scheduling mechanism, you just need to call
 # start() and finish() appropriately. However, public-inbox-httpd
 # (which uses PublicInbox::DS)  will be able to schedule this
@@ -76,11 +76,6 @@ sub child_err ($) {
 	$msg;
 }
 
-sub log_err ($$) {
-	my ($env, $msg) = @_;
-	$env->{'psgi.errors'}->print($msg, "\n");
-}
-
 sub finalize ($$) {
 	my ($self, $err) = @_;
 
@@ -104,7 +99,7 @@ sub finalize ($$) {
 			$self->{err} = $err;
 		}
 		if ($env && $self->{cmd}) {
-			log_err($env, join(' ', @{$self->{cmd}}) . ": $err");
+			warn join(' ', @{$self->{cmd}}) . ": $err";
 		}
 	}
 	if ($qx_cb) {
@@ -188,7 +183,7 @@ sub psgi_qx {
 # PSGI servers.
 sub event_step {
 	my ($self, $err) = @_; # $err: $!
-	log_err($self->{psgi_env}, "psgi_{return,qx} $err") if defined($err);
+	warn "psgi_{return,qx} $err" if defined($err);
 	finish($self);
 	my ($fh, $qx_fh) = delete(@$self{qw(fh qx_fh)});
 	$fh->close if $fh; # async-only (psgi_return)
@@ -197,7 +192,6 @@ sub event_step {
 sub rd_hdr ($) {
 	my ($self) = @_;
 	# typically used for reading CGI headers
-	# we must loop until EAGAIN for EPOLLET in HTTPD/Async.pm
 	# We also need to check EINTR for generic PSGI servers.
 	my $ret;
 	my $total_rd = 0;
@@ -210,14 +204,14 @@ sub rd_hdr ($) {
 			$total_rd += $r;
 			eval { $ret = $ph_cb->($total_rd, $hdr_buf, $ph_arg) };
 			if ($@) {
-				log_err($self->{psgi_env}, "parse_hdr: $@");
+				warn "parse_hdr: $@";
 				$ret = [ 500, [], [ "Internal error\n" ] ];
 			}
 		} else {
 			# caller should notify us when it's ready:
 			return if $! == EAGAIN;
 			next if $! == EINTR; # immediate retry
-			log_err($self->{psgi_env}, "error reading header: $!");
+			warn "error reading header: $!";
 			$ret = [ 500, [], [ "Internal error\n" ] ];
 		}
 	} until (defined $ret);