[PATCH] zombie-fix

[Eric Wong]

---
 lib/PublicInbox/WatchMaildir.pm | 8 +++++---
 script/public-inbox-watch       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index ec28a3034ff..95a9b256b12 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -123,9 +123,10 @@ sub new {
 
 sub _done_for_now {
        my ($self) = @_;
-       my $importers = $self->{importers};
-       foreach my $im (values %$importers) {
+       my $sigfd = $self->{sigfd};
+       foreach my $im (values %{$self->{importers}}) {
                $im->done;
+               $sigfd->event_step if $sigfd; # check signals
        }
 }
 
@@ -910,9 +911,10 @@ sub watch_nntp_init ($$) {
 }
 
 sub watch {
-       my ($self, $sig, $oldset) = @_;
+       my ($self, $sig, $oldset, $sigfd) = @_;
        $self->{oldset} = $oldset;
        $self->{sig} = $sig;
+       $self->{sigfd} = $sigfd;
        my $poll = {}; # intvl_seconds => [ url1, url2 ]
        watch_imap_init($self, $poll) if $self->{imap};
        watch_nntp_init($self, $poll) if $self->{nntp};
diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index c07d45d74ae..8f0200688ed 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -41,5 +41,5 @@ if ($watch_md) {
                PublicInbox::Sigfd::set_sigmask($oldset);
                PublicInbox::DS->SetLoopTimeout(1000);
        }
-       $watch_md->watch($sig, $oldset) while ($watch_md);
+       $watch_md->watch($sig, $oldset, $sigfd) while ($watch_md);
 }
--
unsubscribe: one-click, see List-Unsubscribe header
archive: https://public-inbox.org/meta/