about summary refs log tree commit homepage
path: root/lib/PublicInbox/Qspawn.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-10-13 07:00:36 +0000
committerEric Wong <e@80x24.org>2021-10-13 19:51:20 +0000
commit96b0a14be7e62742ad06f0a37c3cba61fe6c51e7 (patch)
tree2b1fcabfb1b23804c0d05424303f589d1d59a0f2 /lib/PublicInbox/Qspawn.pm
parent6bb8478c8dacf83492de3afe15a615d646f0904f (diff)
downloadpublic-inbox-96b0a14be7e62742ad06f0a37c3cba61fe6c51e7.tar.gz
treewide: use warn() or carp() instead of env->{psgi.errors}
Large chunks of our codebase and 3rd-party dependencies do not
use ->{psgi.errors}, so trying to standardize on it was a
fruitless endeavor.  Since warn() and carp() are standard
mechanism within Perl, just use that instead and simplify a
bunch of existing code.
Diffstat (limited to 'lib/PublicInbox/Qspawn.pm')
-rw-r--r--lib/PublicInbox/Qspawn.pm13
1 files changed, 4 insertions, 9 deletions
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);