Browse Source

[master] [2013] cleanup: reorder log message files

JINMEI Tatuya 13 years ago
parent
commit
923f3c0b2a
2 changed files with 19 additions and 16 deletions
  1. 16 16
      src/bin/ddns/ddns_messages.mes
  2. 3 0
      src/lib/python/isc/ddns/libddns_messages.mes

+ 16 - 16
src/bin/ddns/ddns_messages.mes

@@ -62,6 +62,22 @@ coming from a b10-auth process.
 The ddns process received a shutdown command from the command channel
 and will now shut down.
 
+% DDNS_REQUEST_PARSE_FAIL failed to parse update request: %1
+b10-ddns received an update request via b10-auth, but the received
+data failed to pass minimum validation: it was either totally broken
+as an any valid DNS message (there can be many reasons for that), or
+the opcode is not update, or TSIG is included in the request but it
+fails to validate.  Since b10-auth should have performed this level of
+checks, such an error shouldn't be detected at this stage and should
+rather be considered an internal bug.  This event is therefore logged
+at the error level, and the request is simply dropped.  Additional
+information of the error is also logged.
+
+% DDNS_RESPONSE_SOCKET_ERROR failed to send update response to %1: %2
+Network I/O error happens in sending an update request.  The
+client's address that caused the error and error details are also
+logged.
+
 % DDNS_RUNNING ddns server is running and listening for updates
 The ddns process has successfully started and is now ready to receive commands
 and updates.
@@ -88,19 +104,3 @@ process will now shut down.
 The b10-ddns process encountered an uncaught exception and will now shut
 down. This is indicative of a programming error and should not happen under
 normal circumstances. The exception type and message are printed.
-
-% DDNS_REQUEST_PARSE_FAIL failed to parse update request: %1
-b10-ddns received an update request via b10-auth, but the received
-data failed to pass minimum validation: it was either totally broken
-as an any valid DNS message (there can be many reasons for that), or
-the opcode is not update, or TSIG is included in the request but it
-fails to validate.  Since b10-auth should have performed this level of
-checks, such an error shouldn't be detected at this stage and should
-rather be considered an internal bug.  This event is therefore logged
-at the error level, and the request is simply dropped.  Additional
-information of the error is also logged.
-
-% DDNS_RESPONSE_SOCKET_ERROR failed to send update response to %1: %2
-Network I/O error happens in sending an update request.  The
-client's address that caused the error and error details are also
-logged.

+ 3 - 0
src/lib/python/isc/ddns/libddns_messages.mes

@@ -104,6 +104,9 @@ RRset exists (value independent).  At least one RR with a
 specified NAME and TYPE (in the zone and class specified by
 the Zone Section) must exist.
 
+=======
+>>>>>>> 644c706... [1458] cleanup: reorder log message files
+
 % LIBDDNS_UPDATE_APPROVED update client %1 for zone %2 approved
 Debug message.  An update request was approved in terms of the zone's
 update ACL.