X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FQspawn.pm;h=a1ff65b65324e177f9e5adad67dec703183434a7;hb=96b0a14be7e62742ad06f0a37c3cba61fe6c51e7;hp=b1285eda4a83a8df5d140b166ffc279ad3da5286;hpb=6bb8478c8dacf83492de3afe15a615d646f0904f;p=public-inbox.git diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index b1285eda..a1ff65b6 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -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) @@ -210,14 +205,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);