Browse Source

[trac738] Changes to non build-related items after review

Stephen Morris 14 years ago
parent
commit
9129a474d3
3 changed files with 13 additions and 13 deletions
  1. 10 9
      src/bin/auth/auth_messages.mes
  2. 1 1
      src/bin/auth/auth_srv.cc
  3. 2 3
      src/bin/auth/command.cc

+ 10 - 9
src/bin/auth/auth_messages.mes

@@ -25,7 +25,7 @@ This is a debug message output when the authoritative server has received
 an AXFR query over UDP. Use of UDP for AXFRs is not permitted by the
 an AXFR query over UDP. Use of UDP for AXFRs is not permitted by the
 protocol, so the server will return a FORMERR error to the sender.
 protocol, so the server will return a FORMERR error to the sender.
 
 
-% AUTH_COMMAND_FAILED execution of command '%1' failed: %2
+% AUTH_COMMAND_FAILED execution of command channel instruction '%1' failed: %2
 Execution of the specified command by the authoritative server failed. The
 Execution of the specified command by the authoritative server failed. The
 message contains the reason for the failure.
 message contains the reason for the failure.
 
 
@@ -74,14 +74,14 @@ reason for the failure is given in the message.) The server will drop the
 packet.
 packet.
 
 
 % AUTH_LOAD_TSIG loading TSIG keys
 % AUTH_LOAD_TSIG loading TSIG keys
-This is a debug message indicating that the authoritiative server has
-successfully accessed the keyring holding TSIG keys. It is issued during
-server startup is an indication that the initialization is proceeding
-normally.
+This is a debug message indicating that the authoritiative server
+has requested the keyring holding TSIG keys from the configuration
+database. It is issued during server startup is an indication that the
+initialization is proceeding normally.
 
 
 % AUTH_LOAD_ZONE loaded zone %1/%2
 % AUTH_LOAD_ZONE loaded zone %1/%2
 This debug message is issued during the processing of the 'loadzone' command
 This debug message is issued during the processing of the 'loadzone' command
-when the authoritative server has successfully loaded the names zone of the
+when the authoritative server has successfully loaded the named zone of the
 named class.
 named class.
 
 
 % AUTH_MEM_DATASRC_DISABLED memory data source is disabled for class %1
 % AUTH_MEM_DATASRC_DISABLED memory data source is disabled for class %1
@@ -93,8 +93,9 @@ This is a debug message reporting that the authoritative server has
 discovered that the memory data source is enabled for the given class.
 discovered that the memory data source is enabled for the given class.
 
 
 % AUTH_NO_STATS_SESSION session interface for statistics is not available
 % AUTH_NO_STATS_SESSION session interface for statistics is not available
-For some reason, the authoritative server has no session with the statistics
-module is available. This could be an error in configuration.
+The authoritative server had no session with the statistics module at the
+time it attempted to send it data: the attempt has been abandoned. This
+could be an error in configuration.
 
 
 % AUTH_NO_XFRIN received NOTIFY but XFRIN session is not running
 % AUTH_NO_XFRIN received NOTIFY but XFRIN session is not running
 This is a debug message produced by the authoritative server when it receives
 This is a debug message produced by the authoritative server when it receives
@@ -148,7 +149,7 @@ This is a debug message issued when the authoritative server has received
 a command on the command channel.
 a command on the command channel.
 
 
 % AUTH_RECEIVED_SENDSTATS command 'sendstats' received
 % AUTH_RECEIVED_SENDSTATS command 'sendstats' received
-This is a debug message issues when the authoritative server has received
+This is a debug message issued when the authoritative server has received
 a command from the statistics module to send it data. The 'sendstats'
 a command from the statistics module to send it data. The 'sendstats'
 command is handled differently to other commands, which is why the debug
 command is handled differently to other commands, which is why the debug
 message associated with it has its own code.
 message associated with it has its own code.

+ 1 - 1
src/bin/auth/auth_srv.cc

@@ -640,7 +640,7 @@ AuthSrvImpl::processNotify(const IOMessage& io_message, MessagePtr message,
             return (false);
             return (false);
         }
         }
     } catch (const Exception& ex) {
     } catch (const Exception& ex) {
-            LOG_ERROR(auth_logger, AUTH_ZONEMGR_COMMS).arg(ex.what());
+        LOG_ERROR(auth_logger, AUTH_ZONEMGR_COMMS).arg(ex.what());
         return (false);
         return (false);
     }
     }
 
 

+ 2 - 3
src/bin/auth/command.cc

@@ -232,9 +232,8 @@ execAuthServerCommand(AuthSrv& server, const string& command_id,
         scoped_ptr<AuthCommand>(createAuthCommand(command_id))->exec(server,
         scoped_ptr<AuthCommand>(createAuthCommand(command_id))->exec(server,
                                                                      args);
                                                                      args);
     } catch (const isc::Exception& ex) {
     } catch (const isc::Exception& ex) {
-        // TODO: SHould this be LOG_ERROR?
-        LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_COMMAND_FAILED)
-                  .arg(command_id).arg(ex.what());
+        LOG_ERROR(auth_logger, AUTH_COMMAND_FAILED).arg(command_id)
+                                                   .arg(ex.what());
         return (createAnswer(1, ex.what()));
         return (createAnswer(1, ex.what()));
     }
     }