Browse Source

[trac747] Logging in keyring

Michal 'vorner' Vaner 14 years ago
parent
commit
6b48fd8914
2 changed files with 18 additions and 8 deletions
  1. 4 0
      src/lib/server_common/keyring.cc
  2. 14 8
      src/lib/server_common/server_common_messages.mes

+ 4 - 0
src/lib/server_common/keyring.cc

@@ -13,6 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <server_common/keyring.h>
+#include <server_common/logger.h>
 
 using namespace isc::dns;
 using namespace isc::data;
@@ -31,6 +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);
 
     // Note that 'data' only contains explicitly configured config parameters.
     // So if we use the default list is NULL, rather than an empty list, and
@@ -50,6 +52,7 @@ initKeyring(config::ModuleCCSession& session) {
         // We are already initialized
         return;
     }
+    LOG_DEBUG(logger, DBG_TRACE_BASIC, SRV_COMMON_KEYS_INIT);
     session.addRemoteConfig("tsig_keys", updateKeyring, false);
 }
 
@@ -59,6 +62,7 @@ deinitKeyring(config::ModuleCCSession& session) {
         // Not initialized, ignore it
         return;
     }
+    LOG_DEBUG(logger, DBG_TRACE_BASIC, SRV_COMMON_KEYS_DEINIT);
     keyring.reset();
     session.removeRemoteConfig("tsig_keys");
 }

+ 14 - 8
src/lib/server_common/server_common_messages.mes

@@ -16,18 +16,24 @@ $NAMESPACE isc::server_common
 
 # \brief Messages for the server_common library
 
-% SRV_COMMON_ADDRESS_MISSING Address specification is missing "address" or "port" element in %1
+% SRV_COMMON_ADDRESS_MISSING address specification is missing "address" or "port" element in %1
 
-% SRV_COMMON_PORT_RANGE Port out of valid range (%1 in %2)
+% SRV_COMMON_PORT_RANGE port out of valid range (%1 in %2)
 
-% SRV_COMMON_ADDRESS_TYPE Address specification type is invalid in %1
+% SRV_COMMON_ADDRESS_TYPE address specification type is invalid in %1
 
-% SRV_COMMON_ADDRESSES_NOT_LIST The address and port specification is not a list
+% SRV_COMMON_ADDRESSES_NOT_LIST the address and port specification is not a list
 
-% SRV_COMMON_SET_LISTEN Setting addresses to listen to
+% SRV_COMMON_SET_LISTEN setting addresses to listen to
 
-% SRV_COMMON_ADDRESS_VALUE Address to set: %1#%2
+% SRV_COMMON_ADDRESS_VALUE address to set: %1#%2
 
-% SRV_COMMON_ADDRESS_FAIL Failed to listen on addresses (%1)
+% SRV_COMMON_ADDRESS_FAIL failed to listen on addresses (%1)
 
-% SRV_COMMON_ADDRESS_UNRECOVERABLE Failed to recover original addresses also (%2)
+% SRV_COMMON_ADDRESS_UNRECOVERABLE failed to recover original addresses also (%2)
+
+% SRV_COMMON_KEYS_UPDATE updating TSIG keyring
+
+% SRV_COMMON_KEYS_INIT initializing TSIG keyring
+
+% SRV_COMMON_KEYS_DEINIT deinitilizing TSIG keyring