BIND 10 trac2421, updated. b37e972c6c6a7b9eeb09addab58516a1df74c15b [2421] Include zone name in log messages
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Nov 15 07:20:26 UTC 2012
The branch, trac2421 has been updated
via b37e972c6c6a7b9eeb09addab58516a1df74c15b (commit)
via 74985768e65ba323fac4444945c2d238fdbe24c9 (commit)
from 49d6a081b5e38e6ac463e71ae4daac8c6c4829d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b37e972c6c6a7b9eeb09addab58516a1df74c15b
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Nov 15 12:49:55 2012 +0530
[2421] Include zone name in log messages
commit 74985768e65ba323fac4444945c2d238fdbe24c9
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Nov 15 12:25:22 2012 +0530
[2421] Update DATASRC_LOAD_FROM_ITERATOR_ERROR description
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/client_list.cc | 4 ++--
src/lib/datasrc/datasrc_messages.mes | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 397faae..0750fb6 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -180,7 +180,7 @@ ConfigurableClientList::configure(const ConstElementPtr& config,
paramConf->get(*it)->stringValue());
} catch (const ZoneLoaderException& e) {
LOG_ERROR(logger, DATASRC_LOAD_FROM_FILE_ERROR)
- .arg(e.what());
+ .arg(origin).arg(e.what());
}
} else {
ZoneIteratorPtr iterator;
@@ -199,7 +199,7 @@ ConfigurableClientList::configure(const ConstElementPtr& config,
cache->load(origin, *iterator);
} catch (const ZoneLoaderException& e) {
LOG_ERROR(logger, DATASRC_LOAD_FROM_ITERATOR_ERROR)
- .arg(e.what());
+ .arg(origin).arg(e.what());
}
}
}
diff --git a/src/lib/datasrc/datasrc_messages.mes b/src/lib/datasrc/datasrc_messages.mes
index 54b22ad..3359d24 100644
--- a/src/lib/datasrc/datasrc_messages.mes
+++ b/src/lib/datasrc/datasrc_messages.mes
@@ -305,15 +305,15 @@ Therefore, the zone will not be available for this process. If this is
a problem, you should move the zone to some database backend (sqlite3, for
example) and use it from there.
-% DATASRC_LOAD_FROM_FILE_ERROR %1
+% DATASRC_LOAD_FROM_FILE_ERROR Error loading zone %1: %2
An error was found in the zone data when it was being loaded from a
file. The zone was not loaded. The specific error is shown in the
message, and should be addressed.
-% DATASRC_LOAD_FROM_ITERATOR_ERROR %1
-An error was found in the zone data when it was being loaded from an
-iterator. The zone was not loaded. The specific error is shown in the
-message, and should be addressed.
+% DATASRC_LOAD_FROM_ITERATOR_ERROR Error loading zone %1: %2
+An error was found in the zone data when it was being loaded from
+another data source. The zone was not loaded. The specific error is
+shown in the message, and should be addressed.
% DATASRC_MEM_ADD_RRSET adding RRset '%1/%2' into zone '%3'
Debug information. An RRset is being added to the in-memory data source.
More information about the bind10-changes
mailing list