BIND 10 trac747, updated. f5ae2264a57664aa6ab307865db72f1f740b80c7 [trac747] Further language modifications
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Jun 30 15:56:16 UTC 2011
The branch, trac747 has been updated
via f5ae2264a57664aa6ab307865db72f1f740b80c7 (commit)
via f7af58ec51254d0586ee20ebfae4bd0f8977ed48 (commit)
via ebe5d465d2995899aa3f95c944e0d32d09ec2034 (commit)
from 3f599b883384e9f180f12b06d704ef098e948c8e (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 f5ae2264a57664aa6ab307865db72f1f740b80c7
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Thu Jun 30 17:41:24 2011 +0200
[trac747] Further language modifications
commit f7af58ec51254d0586ee20ebfae4bd0f8977ed48
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Thu Jun 30 17:27:32 2011 +0200
[trac747] Some language fixes
commit ebe5d465d2995899aa3f95c944e0d32d09ec2034
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Thu Jun 30 17:14:04 2011 +0200
[trac747] Shorten the message prefix
So the messages are shorter and the prefix itself doesn't contain an
underscore.
-----------------------------------------------------------------------
Summary of changes:
src/lib/server_common/keyring.cc | 6 +-
src/lib/server_common/portconfig.cc | 16 +++---
src/lib/server_common/server_common_messages.mes | 66 +++++++++++-----------
3 files changed, 43 insertions(+), 45 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/server_common/keyring.cc b/src/lib/server_common/keyring.cc
index 791f20d..501dfd9 100644
--- a/src/lib/server_common/keyring.cc
+++ b/src/lib/server_common/keyring.cc
@@ -32,7 +32,7 @@ updateKeyring(const std::string&, ConstElementPtr data,
const isc::config::ConfigData&) {
ConstElementPtr list(data->get("keys"));
KeyringPtr load(new TSIGKeyRing);
- LOG_DEBUG(logger, DBG_TRACE_BASIC, SRV_COMMON_KEYS_UPDATE);
+ LOG_DEBUG(logger, DBG_TRACE_BASIC, SRVCOMM_KEYS_UPDATE);
// Note that 'data' only contains explicitly configured config parameters.
// So if we use the default list is NULL, rather than an empty list, and
@@ -52,7 +52,7 @@ initKeyring(config::ModuleCCSession& session) {
// We are already initialized
return;
}
- LOG_DEBUG(logger, DBG_TRACE_BASIC, SRV_COMMON_KEYS_INIT);
+ LOG_DEBUG(logger, DBG_TRACE_BASIC, SRVCOMM_KEYS_INIT);
session.addRemoteConfig("tsig_keys", updateKeyring, false);
}
@@ -62,7 +62,7 @@ deinitKeyring(config::ModuleCCSession& session) {
// Not initialized, ignore it
return;
}
- LOG_DEBUG(logger, DBG_TRACE_BASIC, SRV_COMMON_KEYS_DEINIT);
+ LOG_DEBUG(logger, DBG_TRACE_BASIC, SRVCOMM_KEYS_DEINIT);
keyring.reset();
session.removeRemoteConfig("tsig_keys");
}
diff --git a/src/lib/server_common/portconfig.cc b/src/lib/server_common/portconfig.cc
index 83778e0..c60e18d 100644
--- a/src/lib/server_common/portconfig.cc
+++ b/src/lib/server_common/portconfig.cc
@@ -42,7 +42,7 @@ parseAddresses(isc::data::ConstElementPtr addresses,
ConstElementPtr addr(addrPair->get("address"));
ConstElementPtr port(addrPair->get("port"));
if (!addr || ! port) {
- LOG_ERROR(logger, SRV_COMMON_ADDRESS_MISSING).
+ LOG_ERROR(logger, SRVCOMM_ADDRESS_MISSING).
arg(addrPair->str());
isc_throw(BadValue, "Address must contain both the IP"
"address and port");
@@ -51,7 +51,7 @@ parseAddresses(isc::data::ConstElementPtr addresses,
IOAddress(addr->stringValue());
if (port->intValue() < 0 ||
port->intValue() > 0xffff) {
- LOG_ERROR(logger, SRV_COMMON_PORT_RANGE).
+ LOG_ERROR(logger, SRVCOMM_PORT_RANGE).
arg(port->intValue()).arg(addrPair->str());
isc_throw(BadValue, "Bad port value (" <<
port->intValue() << ")");
@@ -60,14 +60,14 @@ parseAddresses(isc::data::ConstElementPtr addresses,
port->intValue()));
}
catch (const TypeError &e) { // Better error message
- LOG_ERROR(logger, SRV_COMMON_ADDRESS_TYPE).
+ LOG_ERROR(logger, SRVCOMM_ADDRESS_TYPE).
arg(addrPair->str());
isc_throw(TypeError,
"Address must be a string and port an integer");
}
}
} else if (addresses->getType() != Element::null) {
- LOG_ERROR(logger, SRV_COMMON_ADDRESSES_NOT_LIST);
+ LOG_ERROR(logger, SRVCOMM_ADDRESSES_NOT_LIST).arg(elemName);
isc_throw(TypeError, elemName + " config element must be a list");
}
}
@@ -92,9 +92,9 @@ installListenAddresses(const AddressList& newAddresses,
isc::asiodns::DNSService& service)
{
try {
- LOG_DEBUG(logger, DBG_TRACE_BASIC, SRV_COMMON_SET_LISTEN);
+ LOG_DEBUG(logger, DBG_TRACE_BASIC, SRVCOMM_SET_LISTEN);
BOOST_FOREACH(const AddressPair& addr, newAddresses) {
- LOG_DEBUG(logger, DBG_TRACE_VALUES, SRV_COMMON_ADDRESS_VALUE).
+ LOG_DEBUG(logger, DBG_TRACE_VALUES, SRVCOMM_ADDRESS_VALUE).
arg(addr.first).arg(addr.second);
}
setAddresses(service, newAddresses);
@@ -114,12 +114,12 @@ installListenAddresses(const AddressList& newAddresses,
* user will get error info, command control can be used to set new
* address. So we just catch the exception without propagating outside
*/
- LOG_ERROR(logger, SRV_COMMON_ADDRESS_FAIL).arg(e);
+ LOG_ERROR(logger, SRVCOMM_ADDRESS_FAIL).arg(e);
try {
setAddresses(service, addressStore);
}
catch (const exception& e2) {
- LOG_FATAL(logger, SRV_COMMON_ADDRESS_UNRECOVERABLE).arg(e2);
+ LOG_FATAL(logger, SRVCOMM_ADDRESS_UNRECOVERABLE).arg(e2);
}
//Anyway the new configure has problem, we need to notify configure
//manager the new configure doesn't work
diff --git a/src/lib/server_common/server_common_messages.mes b/src/lib/server_common/server_common_messages.mes
index d229468..b85fa13 100644
--- a/src/lib/server_common/server_common_messages.mes
+++ b/src/lib/server_common/server_common_messages.mes
@@ -16,60 +16,58 @@ $NAMESPACE isc::server_common
# \brief Messages for the server_common library
-% SRV_COMMON_ADDRESSES_NOT_LIST the address and port specification is not a list
+% SRVCOMM_ADDRESSES_NOT_LIST the address and port specification is not a list in %1
This points to an error in configuration. What was supposed to be a list of
IP address - port pairs isn't a list at all but something else.
-% SRV_COMMON_ADDRESS_FAIL failed to listen on addresses (%1)
+% SRVCOMM_ADDRESS_FAIL failed to listen on addresses (%1)
The server failed to bind to one of the address/port pair it should according
to configuration, for reason listed in the message (usually because that pair
is already used by other service or missing privileges). The server will try
-to recover and bind the address/port pairs it was listening before.
+to recover and bind the address/port pairs it was listening before, if any.
-% SRV_COMMON_ADDRESS_MISSING address specification is missing "address" or "port" element in %1
-This points to an error in configuration. Some address specification is missing
-either the address or port part and therefore can not be used.
+% SRVCOMM_ADDRESS_MISSING address specification is missing "address" or "port" element in %1
+This points to an error in configuration. An address specification in the
+configuration is missing either an address or port and so cannot be used. The
+specification causing the error is given in the message.
-% SRV_COMMON_ADDRESS_TYPE address specification type is invalid in %1
-This points to an error in configuration. Some address specification is
-malformed. The address part must be a string (and a valid IP address, either
-IPv4 or IPv6) and the port must be integer (in the valid range).
+% SRVCOMM_ADDRESS_TYPE address specification type is invalid in %1
+This points to an error in configuration. An address specification in the
+configuration malformed. The specification causing the error is given in the
+message. A valid specification contains an address part (which must be a string
+and must represent a valid IPv4 or IPv6 address) and port (which must be an
+integer in the range valid for TCP/UDP ports on your system).
-% SRV_COMMON_ADDRESS_UNRECOVERABLE failed to recover original addresses also (%2)
-The recovery of old addresses after SRV_COMMON_ADDRESS_FAIL also failed (for
-the reason listed). This should not happen.
+% SRVCOMM_ADDRESS_UNRECOVERABLE failed to recover original addresses also (%2)
+The recovery of old addresses after SRVCOMM_ADDRESS_FAIL also failed for
+the reason listed.
-We would really like to terminate the server right now, but considering that
-the server needs reconfiguration and it is not possible to reconfigure a server
-without it being run, we leave it running in inconsistent and broken state.
-It probably will not work, but will allow the reconfiguration. We hope to
-update the configuration system so we can really crash the server happily
-instead.
+The condition indicates problems with the server and/or the system on
+which it is running. The server will continue running to allow
+reconfiguration, but will not be listening on any address or port until
+an administrator does so.
-% SRV_COMMON_ADDRESS_VALUE address to set: %1#%2
+% SRVCOMM_ADDRESS_VALUE address to set: %1#%2
Debug message. This lists one address and port value of the set of
addresses we are going to listen on (eg. there will be one log message
-per pair). This appears only after SRV_COMMON_SET_LISTEN, but might
+per pair). This appears only after SRVCOMM_SET_LISTEN, but might
be hidden, as it has higher debug level.
-% SRV_COMMON_KEYS_DEINIT deinitilizing TSIG keyring
-Debug message indicating that the server is deinilizing the TSIG keyring. This
-could be seen at server shutdown only, but usually not even there, as leaving
-the TSIG in memory until the real shutdown and memory reclamation by OS is
-harmless, so we don't usually do it.
+% SRVCOMM_KEYS_DEINIT deinitializing TSIG keyring
+Debug message indicating that the server is deinilizing the TSIG keyring.
-% SRV_COMMON_KEYS_INIT initializing TSIG keyring
+% SRVCOMM_KEYS_INIT initializing TSIG keyring
+Debug message indicating that the server is initializing the global TSIG
+keyring. This should be seen only at server start.
+
+% SRVCOMM_KEYS_UPDATE updating TSIG keyring
Debug message indicating new keyring is being loaded from configuration (either
on startup or as a result of configuration update).
-% SRV_COMMON_KEYS_UPDATE updating TSIG keyring
-Debug message indicating that the server is initializing global TSIG keyring.
-This should be seen only at server start.
-
-% SRV_COMMON_PORT_RANGE port out of valid range (%1 in %2)
+% SRVCOMM_PORT_RANGE port out of valid range (%1 in %2)
This points to an error in configuration. The port in some address
specification is out of the valid range (0-65535).
-% SRV_COMMON_SET_LISTEN setting addresses to listen to
+% SRVCOMM_SET_LISTEN setting addresses to listen to
Debug message, noting that the server is about to start listening on a
-different set of IP addresses and ports.
+different set of IP addresses and ports than before.
More information about the bind10-changes
mailing list