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

write_recap: Also clear out non-recap and stale values

Browse source 
Before, if a non-`undef` value was in `%recap` and the corresponding
value in `%config` became `undef`, the `%recap` value would remain
untouched.  Now it is deleted to match `%config`.

Also, any `%recap` values without a corresponding recap variable
declaration are deleted.
This commit is contained in:
Richard Hansen 2024-08-26 00:58:56 -04:00
parent c64e432bf1
commit 94ce6367ec
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ddclient.in
View file

@ -1554,9 +1554,15 @@ sub write_recap {
my ($file) = @_; my ($file) = @_;
for my $h (keys %config) { for my $h (keys %config) {
my $vars = $protocols{opt('protocol', $h)}{variables};
# nic_updateable (called from update_nics for each host) sets `$config{$h}{update}` # nic_updateable (called from update_nics for each host) sets `$config{$h}{update}`
# according to whether an update was attempted. # according to whether an update was attempted.
# #
# Entries in `%recap` with `undef` values are deleted to avoid needing to figure out how to
# represent `undef` in the cache file and to simplify testing. Also, entries for non-recap
# variables (which can happen after changing a host's protocol or after switching to a
# different version of ddclient) are deleted.
#
# TODO: The "configuration change detection" variables are also syncronized if `$recap{$h}` # TODO: The "configuration change detection" variables are also syncronized if `$recap{$h}`
# doesn't exist. Why is this done? Perhaps the intention was to prevent the # doesn't exist. Why is this done? Perhaps the intention was to prevent the
# force-if-config-changed logic from triggering the very first cycle (when there is no # force-if-config-changed logic from triggering the very first cycle (when there is no
@ -1569,7 +1575,7 @@ sub write_recap {
# `$recap{$h}` doesn't exist, and that check is done before the force-if-config-changed # `$recap{$h}` doesn't exist, and that check is done before the force-if-config-changed
# check.) # check.)
if (!exists $recap{$h} || $config{$h}{'update'}) { if (!exists $recap{$h} || $config{$h}{'update'}) {
my $vars = $protocols{opt('protocol', $h)}{variables}; $recap{$h} = {};
for my $v (keys(%$vars)) { for my $v (keys(%$vars)) {
next if !$vars->{$v}{recap} || !defined(opt($v, $h)); next if !$vars->{$v}{recap} || !defined(opt($v, $h));
$recap{$h}{$v} = opt($v, $h); $recap{$h}{$v} = opt($v, $h);
@ -1577,14 +1583,13 @@ sub write_recap {
} else { } else {
for my $v (qw(atime mtime wtime ipv4 ipv6 status-ipv4 status-ipv6 for my $v (qw(atime mtime wtime ipv4 ipv6 status-ipv4 status-ipv6
warned-min-interval warned-min-error-interval)) { warned-min-interval warned-min-error-interval)) {
$recap{$h}{$v} = opt($v, $h); if ($vars->{$v} && $vars->{$v}{recap} && defined(my $val = opt($v, $h))) {
$recap{$h}{$v} = $val;
} else {
delete($recap{$h}{$v});
}
} }
} }
# Clear out entries with `undef` values to avoid needing to figure out how to represent
# `undef` in the cache file and to simplify testing.
for my $v (keys(%{$recap{$h}})) {
delete($recap{$h}{$v}) if !defined($recap{$h}{$v});
}
} }
my $recap = ""; my $recap = "";
@ -3610,8 +3615,6 @@ sub nic_updateable {
$config{$host}{'update'} = 1; $config{$host}{'update'} = 1;
$config{$host}{'atime'} = $now; $config{$host}{'atime'} = $now;
delete($config{$host}{$_}) for qw(wtime warned-min-interval warned-min-error-interval); delete($config{$host}{$_}) for qw(wtime warned-min-interval warned-min-error-interval);
# TODO: Why aren't all of the above "status" variables (the ones deleted from `%config`)
# also removed from `%recap`?
} else { } else {
for (qw(status-ipv4 status-ipv6)) { for (qw(status-ipv4 status-ipv6)) {
$config{$host}{$_} = $recap{$host}{$_} if defined($recap{$host}{$_}); $config{$host}{$_} = $recap{$host}{$_} if defined($recap{$host}{$_});