nntp: use substr to check for trailing CRLF

[public-inbox.git] / lib / PublicInbox / Qspawn.pm

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 68b7111278f52626462a36f5263ccf4096c25b6d..53d0ad55ee84d47ccc10bd2d7516136fd38207e8 100644 (file)
--- 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
@@ -28,7 +28,6 @@ package PublicInbox::Qspawn;
 use strict;
 use PublicInbox::Spawn qw(popen_rd);
 use PublicInbox::GzipFilter;
-use PublicInbox::DS qw(dwaitpid); # doesn't need event loop
 
 # n.b.: we get EAGAIN with public-inbox-httpd, and EINTR on other PSGI servers
 use Errno qw(EAGAIN EINTR);
@@ -58,9 +57,9 @@ sub _do_spawn {
        $self->{cmd} = $o{quiet} ? undef : $cmd;
        eval {
                # popen_rd may die on EMFILE, ENFILE
-               ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%o);
+               $self->{rpipe} = popen_rd($cmd, $cmd_env, \%o);
 
-               die "E: $!" unless defined($self->{pid});
+               die "E: $!" unless defined($self->{rpipe});
 
                $limiter->{running}++;
                $start_cb->($self); # EPOLL_CTL_ADD may ENOSPC/ENOMEM
@@ -77,11 +76,6 @@ sub child_err ($) {
        $msg;
 }
 
-sub log_err ($$) {
-       my ($env, $msg) = @_;
-       $env->{'psgi.errors'}->print($msg, "\n");
-}
-
 sub finalize ($$) {
        my ($self, $err) = @_;
 
@@ -105,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) {
@@ -117,16 +111,14 @@ sub finalize ($$) {
        }
 }
 
-# callback for dwaitpid
+# callback for dwaitpid or ProcessPipe
 sub waitpid_err { finalize($_[0], child_err($?)) }
 
 sub finish ($;$) {
        my ($self, $err) = @_;
-       if (delete $self->{rpipe}) {
-               dwaitpid $self->{pid}, \&waitpid_err, $self;
-       } else {
-               finalize($self, $err);
-       }
+       my $tied_pp = delete($self->{rpipe}) or return finalize($self, $err);
+       my PublicInbox::ProcessPipe $pp = tied *$tied_pp;
+       @$pp{qw(cb arg)} = (\&waitpid_err, $self); # for ->DESTROY
 }
 
 sub start ($$$) {
@@ -191,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)
@@ -200,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;
@@ -213,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);