Commit f7af58ec authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[trac747] Some language fixes

parent ebe5d465
......@@ -67,7 +67,7 @@ parseAddresses(isc::data::ConstElementPtr addresses,
}
}
} else if (addresses->getType() != Element::null) {
LOG_ERROR(logger, SRVCOMM_ADDRESSES_NOT_LIST);
LOG_ERROR(logger, SRVCOMM_ADDRESSES_NOT_LIST).arg(elemName);
isc_throw(TypeError, elemName + " config element must be a list");
}
}
......
......@@ -16,7 +16,7 @@ $NAMESPACE isc::server_common
# \brief Messages for the server_common library
% SRVCOMM_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.
......@@ -24,27 +24,27 @@ IP address - port pairs isn't a list at all but something else.
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.
% SRVCOMM_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.
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.
% SRVCOMM_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).
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).
% 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). This should not happen.
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 with any other
configured addresses although the service may be severely degraded.
% SRVCOMM_ADDRESS_VALUE address to set: %1#%2
Debug message. This lists one address and port value of the set of
......@@ -52,24 +52,21 @@ addresses we are going to listen on (eg. there will be one log message
per pair). This appears only after SRVCOMM_SET_LISTEN, but might
be hidden, as it has higher debug level.
% SRVCOMM_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.
% SRVCOMM_KEYS_INIT initializing TSIG keyring
Debug message indicating new keyring is being loaded from configuration (either
on startup or as a result of configuration update).
% SRVCOMM_KEYS_UPDATE updating TSIG keyring
Debug message indicating that the server is initializing 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).
% 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).
% 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.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment