diff options
| -rw-r--r-- | lib/PublicInbox/DS.pm | 10 | ||||
| -rw-r--r-- | lib/PublicInbox/Eml.pm | 4 | ||||
| -rw-r--r-- | lib/PublicInbox/IPC.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/OverIdx.pm | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 263c3458..ec965abe 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -32,7 +32,7 @@ use Scalar::Util qw(blessed); use PublicInbox::Syscall qw(:epoll); use PublicInbox::Tmpfile; use Errno qw(EAGAIN EINVAL); -use Carp qw(confess carp); +use Carp qw(carp); our @EXPORT_OK = qw(now msg_more dwaitpid); my $nextq; # queue for next_tick @@ -335,9 +335,9 @@ retry: $ev &= ~EPOLLEXCLUSIVE; goto retry; } - die "couldn't add epoll watch for $fd: $!\n"; + die "EPOLL_CTL_ADD $self/$sock/$fd: $!"; } - confess("DescriptorMap{$fd} defined ($DescriptorMap{$fd})") + croak("FD:$fd in use by $DescriptorMap{$fd} (for $self/$sock)") if defined($DescriptorMap{$fd}); $DescriptorMap{$fd} = $self; @@ -368,7 +368,7 @@ sub close { # notifications about it my $fd = fileno($sock); epoll_ctl($Epoll, EPOLL_CTL_DEL, $fd, 0) and - confess("EPOLL_CTL_DEL: $!"); + croak("EPOLL_CTL_DEL($self/$sock): $!"); # we explicitly don't delete from DescriptorMap here until we # actually close the socket, as we might be in the middle of @@ -587,7 +587,7 @@ sub msg_more ($$) { sub epwait ($$) { my ($sock, $ev) = @_; epoll_ctl($Epoll, EPOLL_CTL_MOD, fileno($sock), $ev) and - confess("EPOLL_CTL_MOD $!"); + croak("EPOLL_CTL_MOD($sock): $!"); } # return true if complete, false if incomplete (or failure) diff --git a/lib/PublicInbox/Eml.pm b/lib/PublicInbox/Eml.pm index f7f62e7b..81a6632b 100644 --- a/lib/PublicInbox/Eml.pm +++ b/lib/PublicInbox/Eml.pm @@ -332,7 +332,7 @@ sub body_set { sub body_str_set { my ($self, $body_str) = @_; my $charset = ct($self)->{attributes}->{charset} or - Carp::confess('body_str was given, but no charset is defined'); + croak('body_str was given, but no charset is defined'); body_set($self, \(encode($charset, $body_str, Encode::FB_CROAK))); } @@ -454,7 +454,7 @@ sub body_str { if ($STR_TYPE{$ct->{type}} && $STR_SUBTYPE{$ct->{subtype}}) { return body($self); } - Carp::confess("can't get body as a string for ", + croak("can't get body as a string for ", join("\n\t", header_raw($self, 'Content-Type'))); } decode($charset, body($self), Encode::FB_CROAK); diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index a0e6bfee..0dee2a92 100644 --- a/lib/PublicInbox/IPC.pm +++ b/lib/PublicInbox/IPC.pm @@ -11,7 +11,7 @@ package PublicInbox::IPC; use strict; use v5.10.1; use parent qw(Exporter); -use Carp qw(confess croak); +use Carp qw(croak); use PublicInbox::DS qw(dwaitpid); use PublicInbox::Spawn; use PublicInbox::OnDestroy; diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm index 985c5473..9013ae23 100644 --- a/lib/PublicInbox/OverIdx.pm +++ b/lib/PublicInbox/OverIdx.pm @@ -456,7 +456,7 @@ sub dbh_close { sub create { my ($self) = @_; my $fn = $self->{filename} // do { - Carp::confess('BUG: no {filename}') unless $self->{dbh}; + croak('BUG: no {filename}') unless $self->{dbh}; return; }; unless (-r $fn) { |