lib/PublicInbox/DS.pm | 4 ++-- lib/PublicInbox/DSdeflate.pm | 2 +- lib/PublicInbox/IMAP.pm | 12 +++--------- lib/PublicInbox/NNTP.pm | 10 ++-------- lib/PublicInbox/POP3.pm | 9 ++------- diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 5e8a6a6601c51238a859f429bda5f584cda7a1b1..268406628788931b56d71f31e5a8203c2ce963db 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -660,8 +660,8 @@ my $more = eval { $cb->($self, @args) }; 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}: diff --git a/lib/PublicInbox/DSdeflate.pm b/lib/PublicInbox/DSdeflate.pm index 639690e27f61873cf29234487bac58315b2a51d1..539adf0fbfd47f1097b6ae89952534835cac7006 100644 --- a/lib/PublicInbox/DSdeflate.pm +++ b/lib/PublicInbox/DSdeflate.pm @@ -46,7 +46,7 @@ sub enable { my ($class, $self) = @_; my ($in, $err) = Compress::Raw::Zlib::Inflate->new(%IN_OPT); if ($err != Z_OK) { - $self->err("Inflate->new failed: $err"); + warn("Inflate->new failed: $err\n"); return; } bless $self, $class; diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index 2be1b763f30a89f12e84a8c1fa0339026cf3937d..0a65d87cb009f790fe114ce175a0bff639943f18 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -1165,17 +1165,11 @@ }; my $err = $@; if ($err && $self->{sock}) { $l =~ s/\r?\n//s; - err($self, 'error from: %s (%s)', $l, $err); + warn("error from: $l ($err)\n"); $tag //= '*'; - $res = "$tag BAD program fault - command not performed\r\n"; + $res = \"$tag BAD program fault - command not performed\r\n"; } - return 0 unless defined $res; - $self->write($res); -} - -sub err ($$;@) { - my ($self, $fmt, @args) = @_; - printf { $self->{imapd}->{err} } $fmt."\n", @args; + defined($res) ? $self->write($res) : 0; } sub out ($$;@) { diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index ef01f44886203abdeaa3b07dad35226a9e7d6770..ceaf05f6948da0948fa90fb14fd9eae634faf356 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -72,9 +72,8 @@ return $self->write(\r501) unless args_ok($req, scalar @args); my $res = eval { $req->($self, @args) }; my $err = $@; if ($err && $self->{sock}) { - local $/ = "\n"; - chomp($l); - err($self, 'error from: %s (%s)', $l, $err); + $l =~ s/\r?\n//s; + warn("error from: $l ($err)\n"); $res = \"503 program fault - command not performed\r\n"; } defined($res) ? $self->write($res) : 0; @@ -943,11 +942,6 @@ } } return \"430 no such article on server\r\n" unless @paths; '223 '.join(' ', sort(@paths))."\r\n"; -} - -sub err ($$;@) { - my ($self, $fmt, @args) = @_; - printf { $self->{nntpd}->{err} } $fmt."\n", @args; } sub out ($$;@) { diff --git a/lib/PublicInbox/POP3.pm b/lib/PublicInbox/POP3.pm index c993e558db09c2fbd8de5a15f342099fe6fc4ccd..82df257c2d7002d910ef3d35753512672cacac32 100644 --- a/lib/PublicInbox/POP3.pm +++ b/lib/PublicInbox/POP3.pm @@ -45,11 +45,6 @@ }; # XXX FIXME: duplicated stuff from NNTP.pm and IMAP.pm -sub err ($$;@) { - my ($self, $fmt, @args) = @_; - printf { $self->{pop3d}->{err} } $fmt."\n", @args; -} - sub out ($$;@) { my ($self, $fmt, @args) = @_; printf { $self->{pop3d}->{out} } $fmt."\n", @args; @@ -364,8 +359,8 @@ my $res = $req ? eval { $req->($self, @args) } : \"-ERR command not recognized\r\n"; my $err = $@; if ($err && $self->{sock}) { - chomp($l); - err($self, 'error from: %s (%s)', $l, $err); + $l =~ s/\r?\n//s; + warn("error from: $l ($err)\n"); $res = \"-ERR program fault - command not performed\r\n"; } defined($res) ? $self->write($res) : 0;