diff options
author | Eric Wong <e@80x24.org> | 2021-10-19 09:33:40 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-10-19 17:29:18 +0000 |
commit | 01a049cadb1080698a447479de806755e9bc9342 (patch) | |
tree | 589c0b788a966c1b0a385dbf3bf777af2ac2816d /lib/PublicInbox | |
parent | f7eb00e6312d1f48b3646a4856dd849a5d0c5a0b (diff) | |
download | public-inbox-01a049cadb1080698a447479de806755e9bc9342.tar.gz |
Some error messages already include "\n" (w/ file+line info), so don't add another one. (`warn' will automatically add its caller location unless there's a final "\n").
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/LEI.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 6b989b33..553379e4 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -510,10 +510,10 @@ sub sigpipe_handler { # handles SIGPIPE from @WQ_KEYS workers } sub fail ($$;$) { - my ($self, $buf, $exit_code) = @_; + my ($self, $msg, $exit_code) = @_; local $current_lei = $self; $self->{failed}++; - warn($buf, "\n") if defined $buf; + warn(substr($msg, -1, 1) eq "\n" ? $msg : "$msg\n") if defined $msg; $self->{pkt_op_p}->pkt_do('fail_handler') if $self->{pkt_op_p}; x_it($self, ($exit_code // 1) << 8); undef; @@ -534,7 +534,7 @@ sub child_error { # passes non-fatal curl exit codes to user my ($self, $child_error, $msg) = @_; # child_error is $? local $current_lei = $self; $child_error ||= 1 << 8; - warn($msg, "\n") if defined $msg; + warn(substr($msg, -1, 1) eq "\n" ? $msg : "$msg\n") if defined $msg; if ($self->{pkt_op_p}) { # to top lei-daemon $self->{pkt_op_p}->pkt_do('child_error', $child_error); } elsif ($self->{sock}) { # to lei(1) client |