From 6b563435d3b9913aa08ccf3d900216f607f9fad2 Mon Sep 17 00:00:00 2001
From: Jan Kadlec <jan.kadlec@nic.cz>
Date: Tue, 19 Aug 2014 15:05:27 +0200
Subject: [PATCH] log: Fixed some logging messages
---
src/knot/nameserver/update.c | 8 ++++----
src/knot/zone/zone-load.c | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/knot/nameserver/update.c b/src/knot/nameserver/update.c
index 15d1862ed..b8212a8bf 100644
--- a/src/knot/nameserver/update.c
+++ b/src/knot/nameserver/update.c
@@ -314,7 +314,7 @@ static int process_requests(zone_t *zone, list_t *requests)
/* Evaluate response. */
const uint32_t new_serial = zone_contents_serial(zone->contents);
if (new_serial == old_serial) {
- log_zone_info(zone->name, "DDNS, update finished with no changes to the zone");
+ log_zone_info(zone->name, "DDNS, finished, no changes to the zone were made");
return KNOT_EOK;
}
@@ -377,7 +377,7 @@ static int forward_request(zone_t *zone, struct request_data *request)
log_zone_error(zone->name, "DDNS, failed to forward updates to the master (%s)",
knot_strerror(ret));
} else {
- log_zone_info(zone->name, "DDNS, update forwarded to the master");
+ log_zone_info(zone->name, "DDNS, updates forwarded to the master");
}
return ret;
@@ -545,11 +545,11 @@ int updates_execute(zone_t *zone)
/* Process update list - forward if zone has master, or execute. */
if (zone_master(zone)) {
log_zone_info(zone->name,
- "DDNS, update forwarding %zu updates", update_count);
+ "DDNS, forwarding %zu updates", update_count);
forward_requests(zone, &updates);
} else {
log_zone_info(zone->name,
- "DDNS, update processing %zu updates", update_count);
+ "DDNS, processing %zu updates", update_count);
ret = process_requests(zone, &updates);
}
UNUSED(ret); /* Don't care about the Knot code, RCODEs are set. */
diff --git a/src/knot/zone/zone-load.c b/src/knot/zone/zone-load.c
index 078fe6dad..04a6417e5 100644
--- a/src/knot/zone/zone-load.c
+++ b/src/knot/zone/zone-load.c
@@ -110,7 +110,7 @@ int zone_load_journal(zone_t *zone, zone_contents_t *contents)
/* Apply changesets. */
ret = apply_changesets_directly(contents, &chgs);
- log_zone_info(zone->name, "journal loaded with serial update %u -> %u (%s)",
+ log_zone_info(zone->name, "Applied changes from journal %u -> %u (%s)",
serial, zone_contents_serial(contents),
knot_strerror(ret));
@@ -170,12 +170,11 @@ int zone_load_post(zone_contents_t *contents, zone_t *zone, uint32_t *dnssec_ref
if (ret == KNOT_ENODIFF) {
log_zone_warning(zone->name, "failed to create journal "
"entry, zone file changed without "
- "SOA serial update");
+ "SOA serial update");
ret = KNOT_EOK;
} else if (ret == KNOT_ERANGE) {
log_zone_warning(zone->name, "IXFR history will be lost, "
- "SOA serial has decreased in the zone"
- "file update");
+ "zone file changed, but SOA serial decreased");
ret = KNOT_EOK;
} else if (ret != KNOT_EOK) {
log_zone_error(zone->name, "failed to calculate "
--
GitLab