From: Eric Wong <e@yhbt.net> To: meta@public-inbox.org Subject: [PATCH 1/8] watchmaildir: ensure I:/W:/E: prefixes in warnings Date: Thu, 27 Aug 2020 12:16:59 +0000 [thread overview] Message-ID: <20200827121706.4545-2-e@yhbt.net> (raw) In-Reply-To: <20200827121706.4545-1-e@yhbt.net> For consistency in output, any URL/path-context-dependent prefixes should have the same prefix as the actual warning which triggered it. --- lib/PublicInbox/WatchMaildir.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm index 2ba10a9e..768e0efe 100644 --- a/lib/PublicInbox/WatchMaildir.pm +++ b/lib/PublicInbox/WatchMaildir.pm @@ -198,7 +198,10 @@ sub _try_path { return; } my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ }; - local $SIG{__WARN__} = sub { $warn_cb->("path: $path\n", @_) }; + local $SIG{__WARN__} = sub { + my $pfx = ($_[0] // '') =~ /^([A-Z]: )/g ? $1 : ''; + $warn_cb->($pfx, "path: $path\n", @_); + }; if (!ref($inboxes) && $inboxes eq 'watchspam') { return _remove_spam($self, $path); } @@ -443,8 +446,9 @@ sub imap_fetch_all ($$$) { my ($uids, $batch); my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ }; local $SIG{__WARN__} = sub { + my $pfx = ($_[0] // '') =~ /^([A-Z]: )/g ? $1 : ''; $batch //= '?'; - $warn_cb->("$url UID:$batch\n", @_); + $warn_cb->("$pfx$url UID:$batch\n", @_); }; my $err; do { @@ -875,7 +879,8 @@ sub nntp_fetch_all ($$$) { my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ }; my ($err, $art); local $SIG{__WARN__} = sub { - $warn_cb->("$url ", $art ? ("ARTICLE $art") : (), "\n", @_); + my $pfx = ($_[0] // '') =~ /^([A-Z]: )/g ? $1 : ''; + $warn_cb->("$pfx$url ", $art ? ("ARTICLE $art") : (), "\n", @_); }; my $inboxes = $self->{nntp}->{$url}; my $last_art;
next prev parent reply other threads:[~2020-08-27 12:17 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-27 12:16 [PATCH 0/8] mostly watch-related odds and ends Eric Wong 2020-08-27 12:16 ` Eric Wong [this message] 2020-08-27 12:17 ` [PATCH 2/8] imaptracker: preserve WAL journal_mode if set by user Eric Wong 2020-08-27 12:17 ` [PATCH 3/8] overidx: inline create_ghost sub Eric Wong 2020-08-27 12:17 ` [PATCH 4/8] doc: document graceful shutdown signals Eric Wong 2020-08-27 12:17 ` [PATCH 5/8] doc: speling fickses Eric Wong 2020-08-27 12:17 ` [PATCH 6/8] watch: imap: only remove \Seen spam Eric Wong 2020-08-27 12:17 ` [PATCH 7/8] doc: move watch config docs to -watch manpage Eric Wong 2020-08-27 12:17 ` [PATCH 8/8] doc: watch: expand on NNTP and IMAP-specific knobs Eric Wong 2020-08-28 4:22 ` Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200827121706.4545-2-e@yhbt.net \ --to=e@yhbt.net \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 1/8] watchmaildir: ensure I:/W:/E: prefixes in warnings' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).