dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve rules check (#973)

Browse Source
This commit is contained in:
Xavier Guimard 2016-03-08 18:00:10 +00:00
parent 8357b79684
commit 37f163dc5e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Reload.pm
View File

@ -177,6 +177,15 @@ sub locationRulesInit {
my $rules = $conf->{locationRules}->{$vhost};
foreach my $url ( sort keys %{$rules} ) {
my ( $cond, $prot ) = $class->conditionSub( $rules->{$url}, $tsv );
unless ($cond) {
$tsv->{maintenance}->{$vhost} = 1;
Lemonldap::NG::Handler::Main::Logger->lmLog(
"Unable to build rule '$rules->{$url}': "
. $tsv->{jail}->error,
'error'
);
next;
}
if ( $url eq 'default' ) {
$tsv->{defaultCondition}->{$vhost} = $cond;
@ -408,7 +417,6 @@ sub conditionSub {
$cond = $class->substitute($cond);
my $sub;
unless ( $sub = $tsv->{jail}->jail_reval("sub{return($cond)}") ) {
$tsv->{maintenance}->{$vhost} = 1;
Lemonldap::NG::Handler::Main::Logger->lmLog(
"$self: Unable to build condition ($cond): " . $tsv->{jail}->error,
'error'