Skip to content
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

Jump to bottom

Improve level validation and canonicalisation logic #34

Closed
wants to merge 1 commit into from
Closed

Improve level validation and canonicalisation logic #34

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/Log/Dispatch.pm
View file
Open in desktop
Expand Up @@ -140,10 +140,6 @@ sub log {
my $self = shift;
my %p = @_;

if ( exists $p{level} && $p{level} =~ /\A[0-7]\z/ ) {
$p{level} = $OrderedLevels[ $p{level} ];
}

return unless $self->would_log( $p{level} );

$self->_log_to_outputs( $self->_prepare_message(%p) );
Expand Down Expand Up @@ -241,6 +237,10 @@ sub level_is_valid {
Carp::croak('Logging level was not provided');
}

if ( $level =~ /\A[0-9]+\z/ && $level <= $#OrderedLevels ) {
return $OrderedLevels[$level];
}

return $CanonicalLevelNames{$level};
}

Expand Down
31 changes: 19 additions & 12 deletions lib/Log/Dispatch/Output.pm
View file
Open in desktop
Expand Up @@ -65,18 +65,20 @@ sub _basic_init {

$self->{name} = $p{name} || $self->_unique_name();

$self->{min_level} = $self->_level_as_number( $p{min_level} );
die "Invalid level specified for min_level"
eval { $self->{min_level} = $self->_level_as_number( $p{min_level} ) };
Carp::croak "Invalid level specified for min_level"
unless defined $self->{min_level};

# Either use the parameter supplied or just the highest possible level.
$self->{max_level} = (
exists $p{max_level}
? $self->_level_as_number( $p{max_level} )
: $#{ $self->{level_names} }
);

die "Invalid level specified for max_level"
eval {
$self->{max_level} = (
exists $p{max_level}
? $self->_level_as_number( $p{max_level} )
: $#{ $self->{level_names} }
);
};

Carp::croak "Invalid level specified for max_level"
unless defined $self->{max_level};

my @cb = $self->_get_callbacks(%p);
Expand Down Expand Up @@ -128,12 +130,12 @@ sub _level_as_number {
Carp::croak "undefined value provided for log level";
}

return $level if $level =~ /^\d$/;

unless ( Log::Dispatch->level_is_valid($level) ) {
Carp::croak "$level is not a valid Log::Dispatch log level";
}

return $level if $level =~ /\A[0-9]+\z/;

return $self->{level_numbers}{$level};
}

Expand All @@ -145,7 +147,12 @@ sub _level_as_name {
Carp::croak "undefined value provided for log level";
}

return $level unless $level =~ /^\d$/;
my $canonical_level;
unless ( $canonical_level = Log::Dispatch->level_is_valid($level) ) {
Carp::croak "$level is not a valid Log::Dispatch log level";
}

return $canonical_level unless $level =~ /\A[0-9]+\z/;

return $self->{level_names}[$level];
}
Expand Down