Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve readability of cache var update logic

Browse source
This commit is contained in:
Richard Hansen 2024-06-15 20:39:47 -04:00
parent 0d712f7bbc
commit ab60675660
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ddclient.in
View file

@ -1513,9 +1513,15 @@ sub write_cache {
## merge the updated host entries into the cache. ## merge the updated host entries into the cache.
for my $h (keys %config) { for my $h (keys %config) {
if (!exists $cache{$h} || $config{$h}{'update'}) { if (!exists $cache{$h} || $config{$h}{'update'}) {
map { defined($config{$h}{$_}) ? ($cache{$h}{$_} = $config{$h}{$_}) : () } @{$config{$h}{'cacheable'}}; my $vars = $services{$config{$h}{protocol}}{variables};
for my $v (keys(%$vars)) {
next if !$vars->{$v}{cache} || !defined($config{$h}{$v});
$cache{$h}{$v} = $config{$h}{$v};
}
} else { } else {
map { $cache{$h}{$_} = $config{$h}{$_} } qw(atime wtime status); for my $v (qw(atime wtime status)) {
$cache{$h}{$v} = $config{$h}{$v};
}
} }
} }
@ -1929,15 +1935,6 @@ sub init_config {
map { $hosts{$_} = undef } @hosts; map { $hosts{$_} = undef } @hosts;
map { delete $config{$_} unless exists $hosts{$_} } keys %config; map { delete $config{$_} unless exists $hosts{$_} } keys %config;
## collect the cacheable variables.
for my $proto (keys %services) {
my @cacheable = ();
for my $k (keys %{$services{$proto}{'variables'}}) {
push @cacheable, $k if $services{$proto}{'variables'}{$k}{'cache'};
}
$services{$proto}{'cacheable'} = [ @cacheable ];
}
## sanity check.. ## sanity check..
## make sure config entries have all defaults and they meet minimums ## make sure config entries have all defaults and they meet minimums
## first the globals... ## first the globals...
@ -1989,7 +1986,6 @@ sub init_config {
$conf->{$k} = $value; $conf->{$k} = $value;
} }
$config{$h} = $conf; $config{$h} = $conf;
$config{$h}{'cacheable'} = [ @{$services{$proto}{'cacheable'}} ];
} }
} }