$filtered = undef;
$filter->simple($msg);
- if (PublicInbox::Filter->run($msg)) {
+ if (PublicInbox::Filter->run($msg, $filter)) {
# run spamc again on the HTML-free message
if (do_spamc($msg, \$filtered)) {
$msg = Email::MIME->new(\$filtered);
my ($name, $email, $date) =
PublicInbox::MDA->author_info($msg);
+
+ END {
+ search_index_sync($main_repo) if ($? == 0);
+ };
+
local $ENV{GIT_AUTHOR_NAME} = $name;
local $ENV{GIT_AUTHOR_EMAIL} = $email;
local $ENV{GIT_AUTHOR_DATE} = $date;
$filter->pipe(PublicInbox::MDA->cmd, $main_repo);
}
}
+} else {
+ # Ensure emergency spam gets spamassassin headers.
+ # This makes it easier to prioritize obvious spam from less obvious
+ if (defined($filtered) && length($filtered)) {
+ my $drop = Email::MIME->new(\$filtered);
+ $filtered = undef;
+ $filter->simple($drop);
+ }
}
exit 0; # goes to emergency
return ($@ || $? || !defined($$out) || length($$out) == 0) ? 0 : 1;
}
+
+sub search_index_sync {
+ my ($git_dir) = @_;
+ eval {
+ require PublicInbox::Search;
+ umask 0022; # XXX FIXME use git config core.sharedRepository
+ my $s = PublicInbox::Search->new($git_dir, 2);
+ $s->index_sync;
+ };
+}