BIND 10 trac2559, updated. 6c6f405188cc02d2358e114c33daff58edabd52a [2559] Remove spurious commas in DHCP .spec files
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jan 21 22:03:05 UTC 2013
The branch, trac2559 has been updated
via 6c6f405188cc02d2358e114c33daff58edabd52a (commit)
from 5237d9415f6fb14c932695d59d1d2721b185bfe3 (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 6c6f405188cc02d2358e114c33daff58edabd52a
Author: Stephen Morris <stephen at isc.org>
Date: Mon Jan 21 22:01:48 2013 +0000
[2559] Remove spurious commas in DHCP .spec files
Also correct error messages in the configuration parser: the
same error is logged on any parser error, both creation and
running. The text was made more general.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp4/config_parser.cc | 5 ++---
src/bin/dhcp4/dhcp4.spec | 6 +++---
src/bin/dhcp4/dhcp4_messages.mes | 16 +++++++++-------
src/bin/dhcp6/config_parser.cc | 5 ++---
src/bin/dhcp6/dhcp6.spec | 6 +++---
src/bin/dhcp6/dhcp6_messages.mes | 16 +++++++++-------
6 files changed, 28 insertions(+), 26 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/config_parser.cc b/src/bin/dhcp4/config_parser.cc
index 6ce23f5..67a7ec6 100644
--- a/src/bin/dhcp4/config_parser.cc
+++ b/src/bin/dhcp4/config_parser.cc
@@ -1706,7 +1706,7 @@ configureDhcp4Server(Dhcpv4Srv&, ConstElementPtr config_set) {
}
} catch (const isc::Exception& ex) {
- LOG_ERROR(dhcp4_logger, DHCP4_PARSER_CREATE_FAIL)
+ LOG_ERROR(dhcp4_logger, DHCP4_PARSER_FAIL)
.arg(config_pair.first).arg(ex.what());
answer = isc::config::createAnswer(1,
string("Configuration parsing failed: ") + ex.what());
@@ -1716,8 +1716,7 @@ configureDhcp4Server(Dhcpv4Srv&, ConstElementPtr config_set) {
} catch (...) {
// for things like bad_cast in boost::lexical_cast
- LOG_ERROR(dhcp4_logger, DHCP4_PARSER_CREATE_EXCEPTION)
- .arg(config_pair.first);
+ LOG_ERROR(dhcp4_logger, DHCP4_PARSER_EXCEPTION).arg(config_pair.first);
answer = isc::config::createAnswer(1,
string("Configuration parsing failed"));
diff --git a/src/bin/dhcp4/dhcp4.spec b/src/bin/dhcp4/dhcp4.spec
index 096f2c0..b139d82 100644
--- a/src/bin/dhcp4/dhcp4.spec
+++ b/src/bin/dhcp4/dhcp4.spec
@@ -55,13 +55,13 @@
{ "item_name": "code",
"item_type": "integer",
"item_optional": false,
- "item_default": 0,
+ "item_default": 0
},
{ "item_name": "type",
"item_type": "string",
"item_optional": false,
- "item_default": "",
+ "item_default": ""
},
{ "item_name": "array",
@@ -73,7 +73,7 @@
{ "item_name": "record_types",
"item_type": "string",
"item_optional": false,
- "item_default": "",
+ "item_default": ""
},
{ "item_name": "space",
diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 7f040ab..17f9967 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -132,16 +132,18 @@ A debug message output during a configuration update of the IPv4 DHCP
server, notifying that the parser for the specified configuration element
has been successfully created.
-% DHCP4_PARSER_CREATE_FAIL failed to create parser for configuration element %1: %2
+% DHCP4_PARSER_FAIL failed to create or run parser for configuration element %1: %2
On receipt of message containing details to a change of its configuration,
-the IPv4 DHCP server failed to create a parser to decode the contents of the
-named configuration element. The reason for the failure is given in the
-message.
+the IPv4 DHCP server failed to create a parser to decode the contents
+of the named configuration element, or the creation succeeded but the
+parsing actions and committal of changes failed. The reason for the
+failure is given in the message.
-% DHCP4_PARSER_CREATE_EXCEPTION failed to create parser for configuration element %1
+% DHCP4_PARSER_EXCEPTION failed to create or run parser for configuration element %1
On receipt of message containing details to a change of its configuration,
-the IPv4 DHCP server failed to create a parser to decode the contents
-of the named configuration element. The message has been output in
+the IPv4 DHCP server failed to create a parser to decode the contents of
+the named configuration element, or the creation succeeded but the parsing
+actions and committal of changes failed. The message has been output in
response to a non-BIND 10 exception being raised. Additional messages
may give further information.
diff --git a/src/bin/dhcp6/config_parser.cc b/src/bin/dhcp6/config_parser.cc
index 49cb73c..be67f69 100644
--- a/src/bin/dhcp6/config_parser.cc
+++ b/src/bin/dhcp6/config_parser.cc
@@ -1763,7 +1763,7 @@ configureDhcp6Server(Dhcpv6Srv&, ConstElementPtr config_set) {
}
} catch (const isc::Exception& ex) {
- LOG_ERROR(dhcp6_logger, DHCP6_PARSER_CREATE_FAIL)
+ LOG_ERROR(dhcp6_logger, DHCP6_PARSER_FAIL)
.arg(config_pair.first).arg(ex.what());
answer = isc::config::createAnswer(1,
string("Configuration parsing failed: ") + ex.what());
@@ -1772,8 +1772,7 @@ configureDhcp6Server(Dhcpv6Srv&, ConstElementPtr config_set) {
} catch (...) {
// for things like bad_cast in boost::lexical_cast
- LOG_ERROR(dhcp6_logger, DHCP6_PARSER_CREATE_EXCEPTION)
- .arg(config_pair.first);
+ LOG_ERROR(dhcp6_logger, DHCP6_PARSER_EXCEPTION).arg(config_pair.first);
answer = isc::config::createAnswer(1,
string("Configuration parsing failed"));
// An error occured, so make sure that we restore original data.
diff --git a/src/bin/dhcp6/dhcp6.spec b/src/bin/dhcp6/dhcp6.spec
index a126ed3..2799f06 100644
--- a/src/bin/dhcp6/dhcp6.spec
+++ b/src/bin/dhcp6/dhcp6.spec
@@ -61,13 +61,13 @@
{ "item_name": "code",
"item_type": "integer",
"item_optional": false,
- "item_default": 0,
+ "item_default": 0
},
{ "item_name": "type",
"item_type": "string",
"item_optional": false,
- "item_default": "",
+ "item_default": ""
},
{ "item_name": "array",
@@ -79,7 +79,7 @@
{ "item_name": "record_types",
"item_type": "string",
"item_optional": false,
- "item_default": "",
+ "item_default": ""
},
{ "item_name": "space",
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 63f5231..65ad74b 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -189,16 +189,18 @@ A debug message output during a configuration update of the IPv6 DHCP
server, notifying that the parser for the specified configuration element
has been successfully created.
-% DHCP6_PARSER_CREATE_FAIL failed to create parser for configuration element %1: %2
+% DHCP6_PARSER_FAIL failed to create or run parser for configuration element %1: %2
On receipt of message containing details to a change of its configuration,
-the IPv6 DHCP server failed to create a parser to decode the contents of the
-named configuration element. The reason for the failure is given in the
-message.
+the IPv6 DHCP server failed to create a parser to decode the contents
+of the named configuration element, or the creation succeeded but the
+parsing actions and committal of changes failed. The reason for the
+failure is given in the message.
-% DHCP6_PARSER_CREATE_EXCEPTION failed to create parser for configuration element %1
+% DHCP6_PARSER_EXCEPTION failed to create or run parser for configuration element %1
On receipt of message containing details to a change of its configuration,
-the IPv6 DHCP server failed to create a parser to decode the contents
-of the named configuration element. The message has been output in
+the IPv6 DHCP server failed to create a parser to decode the contents of
+the named configuration element, or the creation succeeded but the parsing
+actions and committal of changes failed. The message has been output in
response to a non-BIND 10 exception being raised. Additional messages
may give further information.
More information about the bind10-changes
mailing list