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

If local cache failed, conf must be returned even

Browse Source
This commit is contained in:
Xavier Guimard 2010-11-01 09:16:32 +00:00
parent 8624d5708b
commit 915254a60c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
View File

@ -152,8 +152,9 @@ sub getConf {
$r = $self->getDBConf($args);
}
else {
$r = $self->{refLocalStorage}->get('conf');
if ( $r->{cfgNum} == $args->{cfgNum} ) {
eval { $r = $self->{refLocalStorage}->get('conf') };
$msg = "Warn: $@" if ($@);
if ( ref($r) and $r->{cfgNum} == $args->{cfgNum} ) {
$msg = "configuration unchanged, get configuration from cache.";
}
else {
@ -275,7 +276,8 @@ sub getLocalConf {
# @param $conf Lemonldap::NG configuration hashRef
sub setLocalConf {
my ( $self, $conf ) = @_;
$self->{refLocalStorage}->set( "conf", $conf );
eval { $self->{refLocalStorage}->set( "conf", $conf ) };
$msg .= "Warn: $@" if ($@);
}
## @method hashRef getDBConf(hashRef args)