X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FLEI.pm;h=93b4ea03b67d58a9193b99e3970e94e221b2aff9;hp=4bd9183e969247da542c2c70a8b4d9935c8b8733;hb=7e4bd71efcf3bf61216ec1a7577e33be5f95b8a9;hpb=d362af89d8019ff12d3550c83de2c3aa5d9f095b diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 4bd9183e..93b4ea03 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -660,6 +660,7 @@ sub wait_wq_events { for my $wq (grep(defined, @$lei{qw(ikw pmd)})) { # auxiliary WQs $wq->wq_close; } + $wq1->{lei_sock} = $lei->{sock} if $wq1; $op_c->{ops} = $ops; } @@ -1405,9 +1406,11 @@ sub fchdir { } sub wq_eof { # EOF callback for main daemon - my ($lei) = @_; + my ($lei, $wq_fld) = @_; local $current_lei = $lei; - delete $lei->{wq1} // return $lei->fail; # already failed + my $wq = delete $lei->{$wq_fld // 'wq1'}; + $lei->sto_done_request($wq); + $wq // $lei->fail; # already failed } sub watch_state_ok ($) { @@ -1514,8 +1517,10 @@ sub lms { } sub sto_done_request { - my ($lei, $sock) = @_; + my ($lei, $wq) = @_; + return unless $lei->{sto}; local $current_lei = $lei; + my $sock = $wq ? $wq->{lei_sock} : undef; eval { if ($sock //= $lei->{sock}) { # issue, async wait $lei->{sto}->wq_io_do('done', [ $sock ]);