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
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);
my $sock = gensym;
tie *$sock, 'PublicInbox::In2Tie', $inot;
$inot->blocking(0);
- $inot->on_overflow(undef); # broadcasts everything on overflow
+ if ($inot->can('on_overflow')) {
+ # broadcasts everything on overflow
+ $inot->on_overflow(undef);
+ }
$self->SUPER::new($sock, EPOLLIN | EPOLLET);
} else {
require PublicInbox::FakeInotify;
$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;
}
warn "$self->{inot}->poll err: $@\n" if $@;
}
+# for graceful shutdown in PublicInbox::Daemon,
+# just ensure the FD gets closed ASAP and subscribers
+sub busy { 0 }
+
1;