daemon: rely on $SIG{__WARN__} for error output

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

diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 77e2e5e9d4a4ed0b96ab02be1f246f4c0ad76048..268406628788931b56d71f31e5a8203c2ce963db 100644 (file)
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -660,8 +660,8 @@ sub long_step {
        if ($@ || !$self->{sock}) { # something bad happened...
                delete $self->{long_cb};
                my $elapsed = now() - $t0;
-               $@ and $self->err("%s during long response[$fd] - %0.6f",
-                                   $@, $elapsed);
+               $@ and warn("$@ during long response[$fd] - ",
+                               sprintf('%0.6f', $elapsed),"\n");
                $self->out(" deferred[$fd] aborted - %0.6f", $elapsed);
                $self->close;
        } elsif ($more) { # $self->{wbuf}:
@@ -688,7 +688,7 @@ sub requeue_once {
        # but only after all pending writes are done.
        # autovivify wbuf.  wbuf may be populated by $cb,
        # no need to rearm if so: (push returns new size of array)
-       requeue($self) if push(@{$self->{wbuf}}, \&long_step) == 1;
+       $self->requeue if push(@{$self->{wbuf}}, \&long_step) == 1;
 }
 
 sub long_response ($$;@) {