about summary refs log tree commit homepage
path: root/lib/PublicInbox/NNTP.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2022-08-10 15:58:01 +0000
committerEric Wong <e@80x24.org>2022-08-10 20:11:10 +0000
commit69a839362deecd86771f306f20ff993f9c9c07c1 (patch)
treeafa97ae342b24844e8702d17596f1109445df3c4 /lib/PublicInbox/NNTP.pm
parent1c457e08d2bb3352bdddde0a3580ff37f317cc72 (diff)
downloadpublic-inbox-69a839362deecd86771f306f20ff993f9c9c07c1.tar.gz
warn/carp usage is unavoidable given Perl itself and standard
libraries, so just rely on localized $SIG{__WARN__} from
60d262483a4d6ddf (daemon: use per-listener SIG{__WARN__} callbacks, 2022-08-08)
for all error reporting.

While we're in the area, make some of the error handling more
consistent between IMAP/NNTP/POP3.
Diffstat (limited to 'lib/PublicInbox/NNTP.pm')
-rw-r--r--lib/PublicInbox/NNTP.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index ef01f448..ceaf05f6 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -72,9 +72,8 @@ sub process_line ($$) {
         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;
@@ -945,11 +944,6 @@ sub cmd_xpath ($$) {
         '223 '.join(' ', sort(@paths))."\r\n";
 }
 
-sub err ($$;@) {
-        my ($self, $fmt, @args) = @_;
-        printf { $self->{nntpd}->{err} } $fmt."\n", @args;
-}
-
 sub out ($$;@) {
         my ($self, $fmt, @args) = @_;
         printf { $self->{nntpd}->{out} } $fmt."\n", @args;