pop3: quiet warning for cached active statements

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

diff --git a/lib/PublicInbox/POP3.pm b/lib/PublicInbox/POP3.pm
index c993e558db09c2fbd8de5a15f342099fe6fc4ccd..bd7dfc6583890901974febd0ed36d536e3403e4c 100644 (file)
--- a/lib/PublicInbox/POP3.pm
+++ b/lib/PublicInbox/POP3.pm
@@ -45,11 +45,6 @@ use constant {
 
 # 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;
@@ -308,7 +303,7 @@ sub __cleanup_state {
        $self->{pop3d}->{-state_dbh}->prepare_cached(<<'')->execute($txn_id);
 DELETE FROM deletes WHERE txn_id = ? AND uid_dele = -1
 
-       my $sth = $self->{pop3d}->{-state_dbh}->prepare_cached(<<'');
+       my $sth = $self->{pop3d}->{-state_dbh}->prepare_cached(<<'', undef, 1);
 SELECT COUNT(*) FROM deletes WHERE user_id = ?
 
        $sth->execute($user_id);
@@ -364,8 +359,8 @@ sub process_line ($$) {
                \"-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;