lei: always use async `done' requests to store

It's safer against deadlocks and we still get proper error
reporting by passing stderr across in addition to the lei
socket.

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 1ba2c2a1..e2b3c0d9 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1537,12 +1537,11 @@ sub lms {
 
 sub sto_done_request {
         my ($lei, $wq) = @_;
-        return unless $lei->{sto};
+        return unless $lei->{sto} && $lei->{sto}->{-wq_s1};
         local $current_lei = $lei;
-        my $sock = $wq ? $wq->{lei_sock} : undef;
-        $sock //= $lei->{sock};
-        my @io;
-        push(@io, $sock) if $sock; # async wait iff possible
+        my $s = ($wq ? $wq->{lei_sock} : undef) // $lei->{sock};
+        my $errfh = $lei->{2} // *STDERR{GLOB};
+        my @io = $s ? ($errfh, $s) : ($errfh);
         eval { $lei->{sto}->wq_io_do('done', \@io) };
         warn($@) if $@;
 }