From eed6318879aeee1fca0ded28de03e7292fe2fc9b Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Thu, 12 Sep 2013 04:31:14 +0000 Subject: [PATCH] Correct bad args order for lmLog --- .../lib/Lemonldap/NG/Handler/Simple.pm | 5 +++-- lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Vhost.pm | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm index 81577d0f7..9eb14ae3c 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm @@ -1509,8 +1509,9 @@ sub grant { my ( $class, $uri ) = splice @_; for ( my $i = 0 ; $i < $locationCount ; $i++ ) { if ( $uri =~ $locationRegexp->[$i] ) { - $class->lmLog( 'debug', - 'Regexp "' . $locationConditionText->[$i] . '" match' ); + $class->lmLog( + 'Regexp "' . $locationConditionText->[$i] . '" match', + 'debug' ); return &{ $locationCondition->[$i] }($datas); } } diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Vhost.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Vhost.pm index 92a52450f..031cd2a7f 100644 --- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Vhost.pm +++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Vhost.pm @@ -175,10 +175,10 @@ sub grant { my $vhost = $apacheRequest->hostname; for ( my $i = 0 ; $i < $locationCount->{$vhost} ; $i++ ) { if ( $uri =~ $locationRegexp->{$vhost}->[$i] ) { - $class->lmLog( 'debug', - 'Regexp "' - . $locationConditionText->{$vhost}->[$i] - . '" match' ); + $class->lmLog( + 'Regexp "' . $locationConditionText->{$vhost}->[$i] . '" match', + 'debug' + ); return &{ $locationCondition->{$vhost}->[$i] }($datas); } } @@ -189,7 +189,7 @@ sub grant { ); return 0; } - $class->lmLog( 'debug', "$vhost: Apply default rule" ); + $class->lmLog( "$vhost: Apply default rule", 'debug' ); return &{ $defaultCondition->{$vhost} }($datas); }