X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPublicInbox%2FLeiImportKw.pm;h=4dd938f5c12c85ad41d1ed322aad9a33d59c49b8;hb=7e4bd71efcf3bf61216ec1a7577e33be5f95b8a9;hp=8359f3386668b19101a8060cd932d20422d7cc35;hpb=6bb8478c8dacf83492de3afe15a615d646f0904f;p=public-inbox.git diff --git a/lib/PublicInbox/LeiImportKw.pm b/lib/PublicInbox/LeiImportKw.pm index 8359f338..4dd938f5 100644 --- a/lib/PublicInbox/LeiImportKw.pm +++ b/lib/PublicInbox/LeiImportKw.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # WQ worker for dealing with LeiImport IMAP flags on already-imported messages @@ -28,13 +28,13 @@ sub ipc_atfork_child { $self->{verbose} = $lei->{opt}->{verbose}; $self->{lse} = $self->{sto}->search; $self->{over} = $self->{lse}->over; - $self->{-lms_ro} = $net->{-lms_ro} || die 'BUG: net->{-lms_ro} FALSE'; + $self->{-lms_rw} = $net->{-lms_rw} || die 'BUG: net->{-lms_rw} FALSE'; $self->SUPER::ipc_atfork_child; } sub ck_update_kw { # via wq_io_do my ($self, $url, $uid, $kw) = @_; - my @oidbin = $self->{-lms_ro}->num_oidbin($url, $uid); + my @oidbin = $self->{-lms_rw}->num_oidbin($url, $uid); my $uid_url = "$url/;UID=$uid"; @oidbin > 1 and warn("W: $uid_url not unique:\n", map { "\t".unpack('H*', $_)."\n" } @oidbin); @@ -47,10 +47,7 @@ sub ck_update_kw { # via wq_io_do } sub _lei_wq_eof { # EOF callback for main lei daemon - my ($lei) = @_; - my $ikw = delete $lei->{ikw} or return $lei->fail; - $lei->sto_done_request($ikw->{lei_sock}); - $ikw->wq_wait_old($lei->can('wq_done_wait'), $lei); + $_[0]->wq_eof('ikw'); } 1;