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

Merge pull request #694 from rhansen/vars

Browse source 
More variable fixes
This commit is contained in:
Richard Hansen 2024-06-29 04:18:57 -04:00 committed by GitHub
commit ab9ac65f46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ddclient.in
View file

@ -1567,7 +1567,7 @@ sub write_recap {
$recap{$h}{$v} = $config{$h}{$v}; $recap{$h}{$v} = $config{$h}{$v};
} }
} else { } else {
for my $v (qw(atime wtime status status-ipv4 status-ivp6)) { for my $v (qw(atime wtime status status-ipv4 status-ipv6)) {
$recap{$h}{$v} = $config{$h}{$v}; $recap{$h}{$v} = $config{$h}{$v};
} }
} }
@ -1919,7 +1919,7 @@ sub init_config {
## parse an interval expression (such as '5m') into number of seconds ## parse an interval expression (such as '5m') into number of seconds
$opt{'daemon'} = interval(opt('daemon')) if defined($opt{'daemon'}); $opt{'daemon'} = interval(opt('daemon')) if defined($opt{'daemon'});
## make sure the interval isn't too short ## make sure the interval isn't too short
$opt{'daemon'} = minimum('daemon') if opt('daemon') > 0 && opt('daemon') < minimum('daemon'); $opt{'daemon'} = minimum('daemon') if opt('daemon') && opt('daemon') < minimum('daemon');
## define or modify host options specified on the command-line ## define or modify host options specified on the command-line
if (defined($opt{'options'})) { if (defined($opt{'options'})) {
@ -1950,7 +1950,7 @@ sub init_config {
## merge options into host definitions or globals ## merge options into host definitions or globals
if (@hosts) { if (@hosts) {
for my $h (@hosts) { for my $h (@hosts) {
$config{$h} = {%{$config{$h}}, %options}; $config{$h} = {%{$config{$h} // {}}, %options, 'host' => $h};
} }
$opt{'host'} = join(',', @hosts); $opt{'host'} = join(',', @hosts);
} else { } else {
@ -2002,6 +2002,11 @@ sub init_config {
# TODO: This might grab an arbitrary protocol-specific variable, which could cause # TODO: This might grab an arbitrary protocol-specific variable, which could cause
# surprising behavior. # surprising behavior.
my $def = $variables{'merged'}{$k}; my $def = $variables{'merged'}{$k};
if (!$def) {
warning("ignoring unknown setting '$k=$globals{$k}'");
delete($globals{$k});
next;
}
# TODO: Isn't $globals{$k} guaranteed to be defined here? Otherwise $k wouldn't appear in # TODO: Isn't $globals{$k} guaranteed to be defined here? Otherwise $k wouldn't appear in
# %globals. # %globals.
my $ovalue = $globals{$k} // $def->{'default'}; my $ovalue = $globals{$k} // $def->{'default'};
@ -2031,7 +2036,7 @@ sub init_config {
} }
my $svars = $protocols{$proto}{'variables'}; my $svars = $protocols{$proto}{'variables'};
my $conf = {'protocol' => $proto}; my $conf = {'host' => $h, 'protocol' => $proto};
for my $k (keys %$svars) { for my $k (keys %$svars) {
# Make sure any _env suffixed variables look at their original entry # Make sure any _env suffixed variables look at their original entry
@ -2041,7 +2046,8 @@ sub init_config {
my $ovalue = $config{$h}{$k} // $def->{'default'}; my $ovalue = $config{$h}{$k} // $def->{'default'};
my $value = check_value($ovalue, $def); my $value = check_value($ovalue, $def);
if ($def->{'required'} && !defined $value) { if ($def->{'required'} && !defined $value) {
warning("skipping host: %s: '%s=%s' is an invalid %s.", $h, $k, $ovalue, $def->{'type'}); $ovalue //= '(not set)';
warning("skipping host $h: invalid $def->{type} variable value '$k=$ovalue'");
delete $config{$h}; delete $config{$h};
next HOST; next HOST;
} }
@ -2405,10 +2411,12 @@ sub split_by_comma {
} }
sub default { sub default {
my $v = shift; my $v = shift;
return undef if !defined($variables{'merged'}{$v});
return $variables{'merged'}{$v}{'default'}; return $variables{'merged'}{$v}{'default'};
} }
sub minimum { sub minimum {
my $v = shift; my $v = shift;
return undef if !defined($variables{'merged'}{$v});
return $variables{'merged'}{$v}{'minimum'}; return $variables{'merged'}{$v}{'minimum'};
} }
sub opt { sub opt {
@ -2565,7 +2573,7 @@ sub check_value {
} elsif (!defined($value) && $required) { } elsif (!defined($value) && $required) {
# None of the types have 'undef' as a valid value, so check definedness once here for # None of the types have 'undef' as a valid value, so check definedness once here for
# convenience. # convenience.
die("$type is required\n"); return undef;
} elsif ($type eq T_DELAY) { } elsif ($type eq T_DELAY) {
$value = interval($value); $value = interval($value);