improve error handling on import fork / lock failures

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

diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm
index fbbc9531a20a4971c23090ed306f4d34681bd2bb..daa2212b4c0f5050eaf38f61b93c2f202ce1af0f 100644 (file)
--- a/lib/PublicInbox/DirIdle.pm
+++ b/lib/PublicInbox/DirIdle.pm
@@ -23,7 +23,7 @@ if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
 
 sub new {
        my ($class, $dirs, $cb) = @_;
-       my $self = bless {}, $class;
+       my $self = bless { cb => $cb }, $class;
        my $inot;
        if ($ino_cls) {
                $inot = $ino_cls->new or die "E: $ino_cls->new: $!";
@@ -35,15 +35,21 @@ sub new {
        }
 
        # Linux::Inotify2->watch or similar
-       $inot->watch($_, $MAIL_IN, $cb) for @$dirs;
+       $inot->watch($_, $MAIL_IN) for @$dirs;
        $self->{inot} = $inot;
+       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 $@;
+       my $cb = $self->{cb};
+       local $PublicInbox::DS::in_loop = 0; # waitpid() synchronously
+       eval {
+               my @events = $self->{inot}->read; # Linux::Inotify2->read
+               $cb->($_) for @events;
+       };
+       warn "$self->{inot}->read err: $@\n" if $@;
 }
 
 1;