watch: ensure SIGCHLD works in forked children

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index efc9849a6effa694b33909179a7cc7f4de71ac40..288f64d1e6c23e1fd53dfbf1d094dff5379f734e 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -12,6 +12,8 @@ use PublicInbox::Filter::Base qw(REJECT);
 use PublicInbox::Spamcheck;
 use PublicInbox::Sigfd;
 use PublicInbox::DS qw(now);
+use PublicInbox::MID qw(mids);
+use PublicInbox::ContentHash qw(content_hash);
 use POSIX qw(_exit);
 *mime_from_path = \&PublicInbox::InboxWritable::mime_from_path;
 
@@ -186,15 +188,14 @@ sub _try_path {
                warn "unmappable dir: $1\n";
                return;
        }
-       if (!ref($inboxes) && $inboxes eq 'watchspam') {
-               return _remove_spam($self, $path);
-       }
-
        my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
        local $SIG{__WARN__} = sub {
                $warn_cb->("path: $path\n");
                $warn_cb->(@_);
        };
+       if (!ref($inboxes) && $inboxes eq 'watchspam') {
+               return _remove_spam($self, $path);
+       }
        foreach my $ibx (@$inboxes) {
                my $eml = mime_from_path($path) or next;
                import_eml($self, $ibx, $eml);
@@ -526,8 +527,8 @@ sub watch_atfork_child ($) {
        delete $self->{poll_pids};
        delete $self->{opendirs};
        PublicInbox::DS->Reset;
+       %SIG = (%SIG, %{$self->{sig}}, CHLD => 'DEFAULT');
        PublicInbox::Sigfd::sig_setmask($self->{oldset});
-       %SIG = (%SIG, %{$self->{sig}});
 }
 
 sub watch_atfork_parent ($) {
@@ -988,10 +989,27 @@ sub _importer_for {
        $importers->{"$ibx"} = $im;
 }
 
+# XXX consider sharing with V2Writable, this only requires read-only access
+sub content_exists ($$) {
+       my ($ibx, $eml) = @_;
+       my $over = $ibx->over or return;
+       my $mids = mids($eml);
+       my $chash = content_hash($eml);
+       my ($id, $prev);
+       for my $mid (@$mids) {
+               while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) {
+                       my $cmp = $ibx->smsg_eml($smsg) or return;
+                       return 1 if $chash eq content_hash($cmp);
+               }
+       }
+       undef;
+}
+
 sub _spamcheck_cb {
        my ($sc) = @_;
        sub {
-               my ($mime) = @_;
+               my ($mime, $ibx) = @_;
+               return if content_exists($ibx, $mime);
                my $tmp = '';
                if ($sc->spamcheck($mime, \$tmp)) {
                        return PublicInbox::Eml->new(\$tmp);