lei note-event: wq_io_do => wq_do

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

diff --git a/lib/PublicInbox/LeiNoteEvent.pm b/lib/PublicInbox/LeiNoteEvent.pm
index 2a7b52c1348735bb2765b56670b36f803fda2e1e..3472e73070d6e86c9fe4f57b87b37db1c7d13be4 100644 (file)
--- a/lib/PublicInbox/LeiNoteEvent.pm
+++ b/lib/PublicInbox/LeiNoteEvent.pm
@@ -11,10 +11,11 @@ use PublicInbox::DS;
 
 our $to_flush; # { cfgpath => $lei }
 
-sub flush_lei ($) {
-       my ($lei) = @_;
-       my $lne = delete $lei->{cfg}->{-lei_note_event};
-       $lne->wq_close(1, undef, $lei) if $lne; # runs _lei_wq_eof;
+sub flush_lei ($;$) {
+       my ($lei, $manual) = @_;
+       my $lne = delete $lei->{cfg}->{-lei_note_event} // return;
+       $lne->{lei_sock} = $lei->{sock} if $manual;
+       $lne->wq_close; # runs _lei_wq_eof;
 }
 
 # we batch up writes and flush every 5s (matching Linux default
@@ -67,13 +68,12 @@ sub lei_note_event {
        die "BUG: unexpected: @rest" if @rest;
        my $cfg = $lei->_lei_cfg or return; # gone (race)
        my $sto = $lei->_lei_store or return; # gone
-       return flush_lei($lei) if $folder eq 'done'; # special case
+       return flush_lei($lei, 1) if $folder eq 'done'; # special case
        my $lms = $lei->lms or return;
        $lms->lms_write_prepare if $new_cur eq ''; # for ->clear_src below
        $lei->{opt}->{quiet} = 1;
-       eval { $lms->arg2folder($lei, [ $folder ]) };
-       return if $@;
-       my $state = $cfg->get_1("watch.$folder", 'state') // 'tag-rw';
+       $lms->arg2folder($lei, [ $folder ]);
+       my $state = $cfg->get_1("watch.$folder.state") // 'tag-rw';
        return if $state eq 'pause';
        return $lms->clear_src($folder, \$bn) if $new_cur eq '';
        $lms->lms_pause;
@@ -97,7 +97,7 @@ sub lei_note_event {
                return if index($fl, 'T') >= 0;
                my $kw = PublicInbox::MdirReader::flags2kw($fl);
                my $vmd = { kw => $kw, sync_info => [ $folder, \$bn ] };
-               $self->wq_io_do('maildir_event', [], $fn, $vmd, $state);
+               $self->wq_do('maildir_event', $fn, $vmd, $state);
        } # else: TODO: imap
 }
 
@@ -112,8 +112,7 @@ sub ipc_atfork_child {
 sub _lei_wq_eof { # EOF callback for main lei daemon
        my ($lei) = @_;
        my $lne = delete $lei->{lne} or return $lei->fail;
-       $lei->sto_done_request;
-       $lne->wq_wait_old($lei->can('wq_done_wait'), $lei);
+       $lei->sto_done_request($lne->{lei_sock});
 }
 
 1;