Skip to content

Disable default output error for EXPIRATION_EARLY #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable default output error for EXPIRATION_EARLY #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions script/le.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,20 +425,30 @@ sub encode_args {

sub parse_config {
my ($opt) = @_;
unless ($opt) {
return sub {
return { code => 1, msg => shift }
my $debug = 0;
my $errors = {
# NB: Early renewal stop is not considered an error by default.
EXPIRATION_EARLY => 0,
};
my $error_sub = sub { # closes upon $debug and $errors above
my ($msg, $code) = @_;
if ($code and $code!~/^\d+$/) {
# Unless associated with 0 exit value, in debug mode
# prefix the message with a passed down code.
unless (!$debug or (defined $errors->{$code} and !$errors->{$code})) {
$msg = "[ $code ] " . ($msg || '');
}
$code = $errors->{$code};
}
return { msg => $msg, code => $code };
};
unless ($opt) {
return $error_sub;
}
if (my $config = _read($opt->{'config'})) {
# INI-like, simplified.
my ($cl, $section) = (0, '');
my $sections = {
errors => {
# NB: Early renewal stop is not considered an error by default.
EXPIRATION_EARLY => 0,
},
};
my $sections = { errors => { %$errors } };
for (split /\r?\n/, $config) {
$cl++;
next if /^\s*(?:;|#)/;
Expand All @@ -454,20 +464,9 @@ sub parse_config {
}
}
# Process errors section.
my $debug = $opt->{'debug'};
my $errors = delete $sections->{'errors'};
$opt->{'error'} = sub {
my ($msg, $code) = @_;
if ($code and $code!~/^\d+$/) {
# Unless associated with 0 exit value, in debug mode
# prefix the message with a passed down code.
unless (!$debug or (defined $errors->{$code} and !$errors->{$code})) {
$msg = "[ $code ] " . ($msg || '');
}
$code = $errors->{$code};
}
return { msg => $msg, code => $code };
};
$debug = $opt->{'debug'};
$errors = delete $sections->{'errors'};
$opt->{'error'} = $error_sub;
return;
} else {
return "Could not read config file.";
Expand Down