X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiImportKw.pm;h=52fd40436a7d262187eee11f70700a68c095eff8;hb=961690bae47c90a4a6960952587c6f4463fb4b19;hp=c35c5c266c4b93ffc36d665b4f3954a5d8feb82f;hpb=7d2f9f7caf63256bab7b3342c52a1d97c889ada4;p=public-inbox.git diff --git a/lib/PublicInbox/LeiImportKw.pm b/lib/PublicInbox/LeiImportKw.pm index c35c5c26..52fd4043 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,15 +28,15 @@ 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 $self->{lei}->err("W: $uid_url not unique:\n", + @oidbin > 1 and warn("W: $uid_url not unique:\n", map { "\t".unpack('H*', $_)."\n" } @oidbin); my %seen; my @docids = sort { $a <=> $b } grep { !$seen{$_}++ } @@ -50,7 +50,6 @@ 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); } 1;