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

dnsexit2: Invert conditions to improve readability

Browse source 
Instead of:

    if ($success1) {
        if ($success2) {
            if ($success3) {
                # yay
            } else {
                # fail
            }
        } else {
            # fail
        }
    } else {
        # fail
    }

do:

    if (!$success1) {
        # fail
    }
    if (!$success2) {
        # fail
    }
    if (!$success3) {
        # fail
    }
    # yay
This commit is contained in:
Richard Hansen 2024-05-29 17:21:39 -04:00
parent 9b1a785c6d
commit 3e91fd02bf
1 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
ddclient.in
View file

@ -4270,49 +4270,51 @@ sub nic_dnsexit2_update {
my $response = decode_json($reply); my $response = decode_json($reply);
# It should at least have a 'code' and 'message'. # It should at least have a 'code' and 'message'.
if (defined($response->{'code'}) and defined($response->{'message'})) { if (!defined($response->{'code'}) || !defined($response->{'message'})) {
if (exists $status{$response->{'code'}}) {
# Add the server response data to the applicable array
push(@{$status{$response->{'code'}}}, $response->{'message'});
if (defined($response->{'details'})) {
push(@{$status{$response->{'code'}}}, $response->{'details'}[0]);
} else {
# Keep it symmetrical for simplicity
push(@{$status{$response->{'code'}}}, "no details received");
}
# Set data from array
my ($status, $message, $srv_message, $srv_details) = @{$status{$response->{'code'}}};
info("Status: %s -- Message: %s", $status, $message);
info("Server Message: %s -- Server Details: %s", $srv_message, $srv_details);
$config{$h}{'status-ipv4'} = $status if $ipv4;
$config{$h}{'status-ipv6'} = $status if $ipv6;
# Handle statuses
if ($status eq 'good') {
success("%s", $message);
$config{$h}{'mtime'} = $now;
for my $ipv (keys %total_payload) {
$config{$h}{"ipv$ipv"} = $total_payload{$ipv}{content};
$config{$h}{"status-ipv$ipv"} = 'good';
success("Updated %s successfully to IPv%s address %s at time %s", $h, $ipv, $total_payload{$ipv}{content}, prettytime($config{$h}{'mtime'}));
}
} elsif ($status eq 'warning') {
warning("%s", $message);
warning("Server response: %s", $srv_message);
} elsif ($status =~ m'^(badauth|error)$') {
failed("%s", $message);
failed("Server response: %s", $srv_message);
} else {
failed("This should not be possible");
}
} else {
failed("Status code %s is unknown!", $response->{'code'});
}
} else {
failed("Did not receive expected \"code\" and \"message\" keys in server response."); failed("Did not receive expected \"code\" and \"message\" keys in server response.");
failed("Response:"); failed("Response:");
failed("%s", $response); failed("%s", $response);
next;
}
if (!exists($status{$response->{'code'}})) {
failed("Status code %s is unknown!", $response->{'code'});
next;
}
# Add the server response data to the applicable array
push(@{$status{$response->{'code'}}}, $response->{'message'});
if (defined($response->{'details'})) {
push(@{$status{$response->{'code'}}}, $response->{'details'}[0]);
} else {
# Keep it symmetrical for simplicity
push(@{$status{$response->{'code'}}}, "no details received");
}
# Set data from array
my ($status, $message, $srv_message, $srv_details) = @{$status{$response->{'code'}}};
info("Status: %s -- Message: %s", $status, $message);
info("Server Message: %s -- Server Details: %s", $srv_message, $srv_details);
$config{$h}{'status-ipv4'} = $status if $ipv4;
$config{$h}{'status-ipv6'} = $status if $ipv6;
# Handle statuses
if ($status ne 'good') {
if ($status eq 'warning') {
warning("%s", $message);
warning("Server response: %s", $srv_message);
} elsif ($status =~ m'^(badauth|error)$') {
failed("%s", $message);
failed("Server response: %s", $srv_message);
} else {
failed("This should not be possible");
}
next;
}
success("%s", $message);
$config{$h}{'mtime'} = $now;
for my $ipv (keys %total_payload) {
$config{$h}{"ipv$ipv"} = $total_payload{$ipv}{content};
$config{$h}{"status-ipv$ipv"} = 'good';
success("Updated %s successfully to IPv%s address %s at time %s", $h, $ipv, $total_payload{$ipv}{content}, prettytime($config{$h}{'mtime'}));
} }
} }
} }