diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Dispatch.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Dispatch.pm index 6e74a701e..236455b81 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Dispatch.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Dispatch.pm @@ -2,7 +2,7 @@ package Lemonldap::NG::Common::Logger::Dispatch; use strict; -our $VERSION = '2.0.0'; +our $VERSION = '2.0.14'; sub new { no warnings 'redefine'; @@ -35,7 +35,7 @@ sub new { $show = 0 if ( $conf->{logLevel} eq $l ); } - die "unknown level $conf->{logLevel}" if ($show); + die "Unknown logLevel $conf->{logLevel}" if ($show); return $self; } diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Sentry.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Sentry.pm index 464f6737f..74eef52b3 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Sentry.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Sentry.pm @@ -10,7 +10,7 @@ package Lemonldap::NG::Common::Logger::Sentry; use strict; use Sentry::Raven; -our $VERSION = '2.0.0'; +our $VERSION = '2.0.14'; sub new { my $self = bless {}, shift; @@ -31,7 +31,7 @@ qq'sub $_ {\$_[0]->{raven}->capture_message(\$_[1],level => "$rl")}'; } $show = 0 if ( $conf->{logLevel} eq $_ ); } - die "unknown level $conf->{logLevel}" if ($show); + die "Unknown logLevel $conf->{logLevel}" if ($show); return $self; } diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Std.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Std.pm index c42b0e4e2..dc04f8e21 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Std.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Std.pm @@ -2,7 +2,7 @@ package Lemonldap::NG::Common::Logger::Std; use strict; -our $VERSION = '2.0.5'; +our $VERSION = '2.0.14'; sub new { no warnings 'redefine'; @@ -18,7 +18,7 @@ qq'sub $_ {print STDERR "[".localtime."] [LLNG:\$\$] [$_] \$_[1]\n"}'; } $show = 0 if ( $level eq $_ ); } - die "unknown level $level" if ($show); + die "Unknown logLevel $level" if ($show); return bless {}, shift; } diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Syslog.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Syslog.pm index 59774799a..6915479d0 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Syslog.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Logger/Syslog.pm @@ -3,7 +3,7 @@ package Lemonldap::NG::Common::Logger::Syslog; use strict; use Sys::Syslog qw(:standard); -our $VERSION = '2.0.9'; +our $VERSION = '2.0.14'; sub new { my ( $class, $conf, %args ) = @_; @@ -34,7 +34,7 @@ sub new { } $show = 0 if ( $level eq $_ ); } - die "unknown level $level" if ($show); + die "Unknown logLevel $level" if ($show); return $self; } diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Init.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Init.pm index c1d0f0d99..fbcae961c 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Init.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Init.pm @@ -54,7 +54,7 @@ sub logLevelInit { eval "require $logger"; die $@ if ($@); unless ( - $class->localConfig->{logLevel} =~ /^(debug|info|notice|warn|error)$/ ) + $class->localConfig->{logLevel} =~ /^(?:debug|info|notice|warn|error)$/ ) { print STDERR 'Bad logLevel value \'' . $class->localConfig->{logLevel} diff --git a/lemonldap-ng-handler/t/05-Lemonldap-NG-Handler-Reload.t b/lemonldap-ng-handler/t/05-Lemonldap-NG-Handler-Reload.t index 9e16f910d..9231e8c8e 100644 --- a/lemonldap-ng-handler/t/05-Lemonldap-NG-Handler-Reload.t +++ b/lemonldap-ng-handler/t/05-Lemonldap-NG-Handler-Reload.t @@ -26,7 +26,7 @@ sub Lemonldap::NG::Handler::Main::defaultLogger { 'Lemonldap::NG::Common::Logger::Std'; } -eval { Lemonldap::NG::Handler::Main->logLevelInit('error') }; +eval { Lemonldap::NG::Handler::Main->logLevelInit() }; ok( !$@, 'logLevelInit' ); ok(