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 7469922b2249f405be5a012eaa25e66c681087da..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;
@@ -301,6 +296,27 @@ sub close {
        $self->SUPER::close;
 }
 
+# must be called inside a state_dbh transaction with flock held
+sub __cleanup_state {
+       my ($self, $txn_id) = @_;
+       my $user_id = $self->{user_id} // die 'BUG: no {user_id}';
+       $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(<<'', undef, 1);
+SELECT COUNT(*) FROM deletes WHERE user_id = ?
+
+       $sth->execute($user_id);
+       my $nr = $sth->fetchrow_array;
+       if ($nr == 0) {
+               $sth = $self->{pop3d}->{-state_dbh}->prepare_cached(<<'');
+DELETE FROM users WHERE user_id = ?
+
+               $sth->execute($user_id);
+       }
+       $nr;
+}
+
 sub cmd_quit {
        my ($self) = @_;
        if (defined(my $txn_id = $self->{txn_id})) {
@@ -308,23 +324,25 @@ sub cmd_quit {
                if (my $exp = delete $self->{expire}) {
                        mark_dele($self, $_) for unpack('S*', $exp);
                }
+               my $keep = 1;
                my $dbh = $self->{pop3d}->{-state_dbh};
                my $lk = $self->{pop3d}->lock_for_scope;
-               my $sth;
                $dbh->begin_work;
 
-               if (defined $self->{txn_max_uid}) {
-                       $sth = $dbh->prepare_cached(<<'');
+               if (defined(my $max = $self->{txn_max_uid})) {
+                       $dbh->prepare_cached(<<'')->execute($max, $txn_id, $max)
 UPDATE deletes SET uid_dele = ? WHERE txn_id = ? AND uid_dele < ?
 
-                       $sth->execute($self->{txn_max_uid}, $txn_id,
-                                       $self->{txn_max_uid});
+               } else {
+                       $keep = $self->__cleanup_state($txn_id);
                }
-               $sth = $dbh->prepare_cached(<<'');
+               $dbh->prepare_cached(<<'')->execute(time, $user_id) if $keep;
 UPDATE users SET last_seen = ? WHERE user_id = ?
 
-               $sth->execute(time, $user_id);
                $dbh->commit;
+               # we MUST do txn_id F_UNLCK here inside ->lock_for_scope:
+               $self->{did_quit} = 1;
+               $self->{pop3d}->unlock_mailbox($self);
        }
        $self->write(\"+OK public-inbox POP3 server signing off\r\n");
        $self->close;
@@ -341,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;
@@ -351,6 +369,7 @@ sub process_line ($$) {
 # callback used by PublicInbox::DS for any (e)poll (in/out/hup/err)
 sub event_step {
        my ($self) = @_;
+       local $SIG{__WARN__} = $self->{pop3d}->{warn_cb};
        return unless $self->flush_write && $self->{sock} && !$self->{long_cb};
 
        # only read more requests if we've drained the write buffer,