From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH v2] daemon: quiet Email::Address::XS warnings properly
Date: Wed, 7 Feb 2024 22:49:19 +0000 [thread overview]
Message-ID: <20240207224919.M669761@dcvr> (raw)
In-Reply-To: <20240202092459.2802045-1-e@80x24.org>
Eric Wong <e@80x24.org> wrote:
> index a2c1ed6e..7aee5c72 100644
> --- a/lib/PublicInbox/Daemon.pm
> +++ b/lib/PublicInbox/Daemon.pm
> @@ -698,7 +701,6 @@ sub run {
> # localize GCF2C for tests:
> local $PublicInbox::GitAsyncCat::GCF2C;
> local $PublicInbox::Git::async_warn = 1;
> - local $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
> local %WORKER_SIG = %WORKER_SIG;
> local %POST_ACCEPT;
That 2nd hunk is still necessary due to ->event_step callbacks
from asynchronous git blob retrievals. It wasn't 100% correct,
since it can put warnings in the wrong file, though...
--------8<-------
Subject: [PATCH] daemon: quiet Email::Address::XS warnings properly
Setting $SIG{__WARN__} at the top-level no longer has any effect
since we localize $SIG{__WARN__} when entering ->event_step on
a per-listener basis.
Fixes: 60d262483a4d (daemon: use per-listener SIG{__WARN__} callbacks, 2022-08-08)
---
lib/PublicInbox/Daemon.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index a2c1ed6e..e578f2e8 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -143,8 +143,11 @@ sub load_mod ($;$$) {
$tlsd->{$f} = $logs{$p} //= open_log_path(my $fh, $p);
warn "# $scheme://$addr $f=$p\n";
}
+ # for per-listener $SIG{__WARN__}:
my $err = $tlsd->{err};
- $tlsd->{warn_cb} = sub { print $err @_ }; # for local $SIG{__WARN__}
+ $tlsd->{warn_cb} = sub {
+ print $err @_ unless PublicInbox::Eml::warn_ignore(@_)
+ };
$opt->{'multi-accept'} and
$xn{'multi-accept'} = $opt->{'multi-accept'}->[-1];
\%xn;
prev parent reply other threads:[~2024-02-07 22:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 9:24 [PATCH] daemon: quiet Email::Address::XS warnings properly Eric Wong
2024-02-07 22:49 ` Eric Wong [this message]
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=20240207224919.M669761@dcvr \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).