imap: delay InboxIdle start, support refresh

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

diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm
index 095a801c946514099639f7e82db80e23e3a46331..c19b8d186cdcdfd88f13d1f38d11c2d835b5d850 100644 (file)
--- a/lib/PublicInbox/InboxIdle.pm
+++ b/lib/PublicInbox/InboxIdle.pm
@@ -4,7 +4,8 @@
 package PublicInbox::InboxIdle;
 use strict;
 use base qw(PublicInbox::DS);
-use fields qw(pi_config inot);
+use fields qw(pi_config inot pathmap);
+use Cwd qw(abs_path);
 use Symbol qw(gensym);
 use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
 my $IN_CLOSE = 0x08 | 0x10; # match Linux inotify
@@ -19,13 +20,35 @@ if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
 require PublicInbox::In2Tie if $ino_cls;
 
 sub in2_arm ($$) { # PublicInbox::Config::each_inbox callback
-       my ($ibx, $inot) = @_;
-       my $path = "$ibx->{inboxdir}/";
-       $path .= $ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock';
-       $inot->watch($path, $IN_CLOSE, sub { $ibx->on_unlock });
+       my ($ibx, $self) = @_;
+       my $dir = abs_path($ibx->{inboxdir});
+       if (!defined($dir)) {
+               warn "W: $ibx->{inboxdir} not watched: $!\n";
+               return;
+       }
+       my $inot = $self->{inot};
+       my $cur = $self->{pathmap}->{$dir} //= [];
+
+       # transfer old subscriptions to the current inbox, cancel the old watch
+       if (my $old_ibx = $cur->[0]) {
+               $ibx->{unlock_subs} and
+                       die "BUG: $dir->{unlock_subs} should not exist";
+               $ibx->{unlock_subs} = $old_ibx->{unlock_subs};
+               $cur->[1]->cancel;
+       }
+       $cur->[0] = $ibx;
+
+       my $lock = "$dir/".($ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock');
+       $cur->[1] = $inot->watch($lock, $IN_CLOSE, sub { $ibx->on_unlock });
+
        # TODO: detect deleted packs (and possibly other files)
 }
 
+sub refresh {
+       my ($self, $pi_config) = @_;
+       $pi_config->each_inbox(\&in2_arm, $self);
+}
+
 sub new {
        my ($class, $pi_config) = @_;
        my $self = fields::new($class);
@@ -42,7 +65,8 @@ sub new {
                $inot = PublicInbox::FakeInotify->new;
        }
        $self->{inot} = $inot;
-       $pi_config->each_inbox(\&in2_arm, $inot);
+       $self->{pathmap} = {}; # inboxdir => [ ibx, watch1, watch2, watch3...]
+       refresh($self, $pi_config);
        $self;
 }