net: leaseshelper: Ignore corrupted lease file and rewrite it

Instead of reporting an error and terminating, rewrite the file with
the newly learned info.
This commit is contained in:
Peter Krempa 2014-06-16 16:53:42 +02:00
parent f1385e222e
commit 45d51681ce

View File

@ -274,16 +274,16 @@ main(int argc, char **argv)
if (custom_lease_file_len) { if (custom_lease_file_len) {
if (!(leases_array = virJSONValueFromString(lease_entries))) { if (!(leases_array = virJSONValueFromString(lease_entries))) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("invalid json in file: %s"), custom_lease_file); _("invalid json in file: %s, rewriting it"),
goto cleanup; custom_lease_file);
} } else {
if ((size = virJSONValueArraySize(leases_array)) < 0) { if ((size = virJSONValueArraySize(leases_array)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("couldn't fetch array of leases")); _("couldn't fetch array of leases"));
goto cleanup; goto cleanup;
} }
} }
}
if (!(leases_array_new = virJSONValueNewArray())) { if (!(leases_array_new = virJSONValueNewArray())) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",