From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BAEC81F49B for ; Tue, 25 Apr 2023 11:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1682420579; bh=wAvFqNe2s78kT1IA0OgXdvsqFpFPypHKNNUyEw2TH8w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qlTepgCGP8nWyQzlz7sweRYFqGPfBMH9nxSjTml+tAyH5LoT8FA1mb7kE4ePg4thb ARfXuQZQDU5TYlETW6bt9nc5yk03IGXbk92QznPtii24PMQVh4DAHaQJ0E+0+r2/FF /XuuA+00EaXBglwGLzAVzGBJWJEW4wrCr634kv/A= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 6/6] emergency: make error messages more consistent Date: Tue, 25 Apr 2023 11:02:58 +0000 Message-Id: <20230425110258.2538658-7-e@80x24.org> In-Reply-To: <20230425110258.2538658-1-e@80x24.org> References: <20230425110258.2538658-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Showing "failed" is needless if we already know the program is die-ing. We'll prefix "BUG:" to bug messages, "W:" to non-fatal warnings to be consistent with our newer code such as lei. --- lib/PublicInbox/Emergency.pm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/PublicInbox/Emergency.pm b/lib/PublicInbox/Emergency.pm index 56c58dd1..74a4069a 100644 --- a/lib/PublicInbox/Emergency.pm +++ b/lib/PublicInbox/Emergency.pm @@ -1,10 +1,9 @@ -# Copyright (C) 2016-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # # Emergency Maildir delivery for MDA package PublicInbox::Emergency; -use strict; -use v5.10.1; +use v5.12; use Fcntl qw(:DEFAULT SEEK_SET); use Sys::Hostname qw(hostname); use IO::Handle; # ->flush @@ -35,14 +34,14 @@ sub prepare { my ($self, $strref) = @_; my $pid = $$; my $tmp_key = "tmp.$pid"; - die "already in transaction: $self->{$tmp_key}" if $self->{$tmp_key}; + die "BUG: in transaction: $self->{$tmp_key}" if $self->{$tmp_key}; my ($tmp, $fh); do { $tmp = _fn_in($self, $pid, 'tmp'); $! = undef; } while (!sysopen($fh, $tmp, O_CREAT|O_EXCL|O_RDWR) and $! == EEXIST); - print $fh $$strref or die "write failed: $!"; - $fh->flush or die "flush failed: $!"; + print $fh $$strref or die "print: $!"; + $fh->flush or die "flush: $!"; $self->{fh} = $fh; $self->{$tmp_key} = $tmp; } @@ -51,15 +50,15 @@ sub abort { my ($self) = @_; delete $self->{fh}; my $tmp = delete $self->{"tmp.$$"} or return; - unlink($tmp) or warn "Failed to unlink $tmp: $!"; + unlink($tmp) or warn "W: unlink($tmp): $!"; undef; } sub fh { my ($self) = @_; - my $fh = $self->{fh} or die "{fh} not open!\n"; - seek($fh, 0, SEEK_SET) or die "seek(fh) failed: $!"; - sysseek($fh, 0, SEEK_SET) or die "sysseek(fh) failed: $!"; + my $fh = $self->{fh} or die "BUG: {fh} not open"; + seek($fh, 0, SEEK_SET) or die "seek: $!"; + sysseek($fh, 0, SEEK_SET) or die "sysseek: $!"; $fh; } @@ -73,7 +72,7 @@ sub commit { $new = _fn_in($self, $pid, 'new'); } while (!($ok = link($tmp, $new)) && $! == EEXIST); die "link($tmp, $new): $!" unless $ok; - unlink($tmp) or warn "Failed to unlink $tmp: $!"; + unlink($tmp) or warn "W: unlink($tmp): $!"; } sub DESTROY { commit($_[0]) }