lei: simplify internal arg2folder usage

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

diff --git a/lib/PublicInbox/LeiNoteEvent.pm b/lib/PublicInbox/LeiNoteEvent.pm
index c03c53193b032297da2d9abee056c3892a9844ab..43d5ed0f099e88f8dbc16b2949d70c191b61da68 100644 (file)
--- a/lib/PublicInbox/LeiNoteEvent.pm
+++ b/lib/PublicInbox/LeiNoteEvent.pm
@@ -7,8 +7,8 @@ package PublicInbox::LeiNoteEvent;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC);
+use PublicInbox::DS;
 
-my $flush_timer;
 our $to_flush; # { cfgpath => $lei }
 
 sub flush_lei ($) {
@@ -20,7 +20,6 @@ sub flush_lei ($) {
 # we batch up writes and flush every 5s (matching Linux default
 # writeback behavior) since MUAs can trigger a storm of inotify events
 sub flush_task { # PublicInbox::DS timer callback
-       undef $flush_timer;
        my $todo = $to_flush // return;
        $to_flush = undef;
        for my $lei (values %$todo) { flush_lei($lei) }
@@ -29,7 +28,7 @@ sub flush_task { # PublicInbox::DS timer callback
 # sets a timer to flush
 sub note_event_arm_done ($) {
        my ($lei) = @_;
-       $flush_timer //= PublicInbox::DS::add_timer(5, \&flush_task);
+       PublicInbox::DS::add_uniq_timer('flush_timer', 5, \&flush_task);
        $to_flush->{$lei->{cfg}->{'-f'}} //= $lei;
 }
 
@@ -37,18 +36,18 @@ sub eml_event ($$$$) {
        my ($self, $eml, $vmd, $state) = @_;
        my $sto = $self->{lei}->{sto};
        if ($state =~ /\Aimport-(?:rw|ro)\z/) {
-               $sto->ipc_do('set_eml', $eml, $vmd);
+               $sto->wq_do('set_eml', $eml, $vmd);
        } elsif ($state =~ /\Aindex-(?:rw|ro)\z/) {
                my $xoids = $self->{lei}->ale->xoids_for($eml);
-               $sto->ipc_do('index_eml_only', $eml, $vmd, $xoids);
+               $sto->wq_do('index_eml_only', $eml, $vmd, $xoids);
        } elsif ($state =~ /\Atag-(?:rw|ro)\z/) {
                my $docids = [];
                my $c = $self->{lse}->kw_changed($eml, $vmd->{kw}, $docids);
                if (scalar @$docids) { # already in lei/store
-                       $sto->ipc_do('set_eml_vmd', undef, $vmd, $docids) if $c;
+                       $sto->wq_do('set_eml_vmd', undef, $vmd, $docids) if $c;
                } elsif (my $xoids = $self->{lei}->ale->xoids_for($eml)) {
                        # it's in an external, only set kw, here
-                       $sto->ipc_do('set_xvmd', $xoids, $eml, $vmd);
+                       $sto->wq_do('set_xvmd', $xoids, $eml, $vmd);
                } # else { totally unknown: ignore
        } else {
                warn "unknown state: $state (in $self->{lei}->{cfg}->{'-f'})\n";
@@ -69,8 +68,9 @@ sub lei_note_event {
        return flush_lei($lei) if $folder eq 'done'; # special case
        my $lms = $lei->lms or return;
        $lms->lms_write_prepare if $new_cur eq ''; # for ->clear_src below
-       my $err = $lms->arg2folder($lei, [ $folder ]);
-       return if $err->{fail};
+       $lei->{opt}->{quiet} = 1;
+       eval { $lms->arg2folder($lei, [ $folder ]) };
+       return if $@;
        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 '';
@@ -81,8 +81,9 @@ sub lei_note_event {
        my $self = $cfg->{-lei_note_event} //= do {
                my $wq = bless { lms => $lms }, __PACKAGE__;
                # MUAs such as mutt can trigger massive rename() storms so
-               # use all CPU power available:
+               # use some CPU, but don't overwhelm slower storage, either
                my $jobs = $wq->detect_nproc // 1;
+               $jobs = 4 if $jobs > 4; # same default as V2Writable
                my ($op_c, $ops) = $lei->workers_start($wq, $jobs);
                $lei->wait_wq_events($op_c, $ops);
                note_event_arm_done($lei);