From e16594babeae00a5eb43f68de346ac44dec411bc Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 26 Jul 2016 09:34:18 +0200
Subject: [PATCH] load: move journal specific log to a better place
---
src/knot/events/handlers/load.c | 7 -------
src/knot/zone/zone-load.c | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/knot/events/handlers/load.c b/src/knot/events/handlers/load.c
index ef9adde93f..fbe2878b49 100644
--- a/src/knot/events/handlers/load.c
+++ b/src/knot/events/handlers/load.c
@@ -64,13 +64,6 @@ int event_load(conf_t *conf, zone_t *zone)
/*! \todo issue #242 dnssec signing should occur in the special event */
ret = zone_load_post(conf, zone, contents, &dnssec_refresh);
if (ret != KNOT_EOK) {
- if (ret == KNOT_ESPACE) {
- log_zone_error(zone->name, "journal size is too small "
- "to fit the changes");
- } else {
- log_zone_error(zone->name, "failed to store changes into "
- "journal (%s)", knot_strerror(ret));
- }
goto fail;
}
diff --git a/src/knot/zone/zone-load.c b/src/knot/zone/zone-load.c
index 49214647c6..fd6045e3c9 100644
--- a/src/knot/zone/zone-load.c
+++ b/src/knot/zone/zone-load.c
@@ -219,6 +219,13 @@ int zone_load_post(conf_t *conf, zone_t *zone, zone_contents_t *contents,
/* Write changes (DNSSEC, diff, or both) to journal if all went well. */
if (!changeset_empty(&change)) {
ret = zone_change_store(conf, zone, &change);
+ if (ret == KNOT_ESPACE) {
+ log_zone_error(zone->name, "journal size is too small "
+ "to fit the changes");
+ } else {
+ log_zone_error(zone->name, "failed to store changes into "
+ "journal (%s)", knot_strerror(ret));
+ }
}
changeset_clear(&change);
--
GitLab