X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInboxIdle.pm;h=357bd216b5c30642fef65c84bbd343053d53ec25;hb=a0b470cbaf01c699e008818ff0f137d24b1959b1;hp=59cb833fd5a10b466ae74ac8a65d91df3987ffa6;hpb=94096cab6cd5e00c8a36a4a2667bdb9acf43d01f;p=public-inbox.git

diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm
index 59cb833f..357bd216 100644
--- a/lib/PublicInbox/InboxIdle.pm
+++ b/lib/PublicInbox/InboxIdle.pm
@@ -36,12 +36,21 @@ sub in2_arm ($$) { # PublicInbox::Config::each_inbox callback
 		$ibx->{unlock_subs} and
 			die "BUG: $dir->{unlock_subs} should not exist";
 		$ibx->{unlock_subs} = $old_ibx->{unlock_subs};
-		$cur->[1]->cancel;
+		$cur->[1]->cancel; # Linux::Inotify2::Watch::cancel
 	}
 	$cur->[0] = $ibx;
 
 	my $lock = "$dir/".($ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock');
-	$cur->[1] = $inot->watch($lock, $IN_MODIFY, sub { $ibx->on_unlock });
+	if (my $w = $cur->[1] = $inot->watch($lock, $IN_MODIFY)) {
+		$self->{on_unlock}->{$w->name} = $ibx;
+	} else {
+		warn "E: ".ref($inot)."->watch($lock, IN_MODIFY) failed: $!\n";
+		if ($!{ENOSPC} && $^O eq 'linux') {
+			warn <<"";
+I: consider increasing /proc/sys/fs/inotify/max_user_watches
+
+		}
+	}
 
 	# TODO: detect deleted packs (and possibly other files)
 }
@@ -65,14 +74,24 @@ sub new {
 	}
 	$self->{inot} = $inot;
 	$self->{pathmap} = {}; # inboxdir => [ ibx, watch1, watch2, watch3...]
+	$self->{on_unlock} = {}; # lock path => ibx
 	refresh($self, $pi_config);
+	PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
 	$self;
 }
 
 sub event_step {
 	my ($self) = @_;
-	eval { $self->{inot}->poll }; # Linux::Inotify2::poll
-	warn "$self->{inot}->poll err: $@\n" if $@;
+	eval {
+		my @events = $self->{inot}->read; # Linux::Inotify2::read
+		my $on_unlock = $self->{on_unlock};
+		for my $ev (@events) {
+			if (my $ibx = $on_unlock->{$ev->fullname}) {
+				$ibx->on_unlock;
+			}
+		}
+	};
+	warn "{inot}->read err: $@\n" if $@;
 }
 
 # for graceful shutdown in PublicInbox::Daemon,