From 901305dfe6837f5c1e9ae185f4cb536b92124049 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Jun 2020 10:34:18 +0000 Subject: watch: show path for warnings from spam messages It could be useful to see warnings generated for known problematic messages just as it is for possibly non-problematic ones. --- lib/PublicInbox/WatchMaildir.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm index ec28a303..25b87e93 100644 --- a/lib/PublicInbox/WatchMaildir.pm +++ b/lib/PublicInbox/WatchMaildir.pm @@ -188,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); -- cgit v1.2.3-24-ge0c7