[2252] replace the log message XFRIN_RECEIVED_COMMAND to the more general id XFRIN_RE...

diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 76c2665462f235ef3802e43176e4ac29d2507597..a4e84dd21b4b285e36b77c21a8faa7bd6a13bc11 100755 (executable)
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1514,6 +1514,7 @@ class Xfrin:
             th.join()
 
     def command_handler(self, command, args):
+        logger.debug(DBG_XFRIN_TRACE, XFRIN_RECEIVED_COMMAND, command)
         answer = create_answer(0)
         try:
             if command == 'shutdown':
@@ -1589,8 +1590,6 @@ class Xfrin:
                 # b10-stats daemon is periodically asking to the
                 # b10-xfrin daemon.
                 answer = create_answer(0, self._counters.get_statistics())
-                logger.debug(DBG_XFRIN_TRACE, XFRIN_RECEIVED_GETSTATS_COMMAND,
-                             str(answer))
 
             else:
                 answer = create_answer(1, 'unknown command: ' + command)

diff --git a/src/bin/xfrin/xfrin_messages.mes b/src/bin/xfrin/xfrin_messages.mes
index 6f9d9702a96d70b292ef0c9d6599f71919abfdcb..7160d1752b01b05bba29050732d646467967fb2f 100644 (file)
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -275,6 +275,5 @@ there's some issue with it. It might be correct, but it should be checked
 and possibly fixed on the remote server. The problem is described in the
 message. The problem does not stop the zone from being used.
 
-% XFRIN_RECEIVED_GETSTATS_COMMAND received command to send statistics data: %1
-The xfrin daemon received a command on the command channel that
-statistics data should be sent to the stats daemon.
+% XFRIN_RECEIVED_COMMAND received command: %1
+The xfrin daemon received a command on the command channel.

diff --git a/tests/lettuce/features/xfrin_notify_handling.feature b/tests/lettuce/features/xfrin_notify_handling.feature
index a411a6ff85bd24703e504c3215d09d2275809c6b..80e5258faa8b62d8eb536c19e5b739eb045f4fed 100644 (file)
--- a/tests/lettuce/features/xfrin_notify_handling.feature
+++ b/tests/lettuce/features/xfrin_notify_handling.feature
@@ -79,7 +79,7 @@ Feature: Xfrin incoming notify handling
     # wait until the last stats requesting is finished
     When I query statistics zones of bind10 module Xfrin with cmdctl
     wait for new bind10 stderr message STATS_SEND_STATISTICS_REQUEST
-    wait for new bind10 stderr message XFRIN_RECEIVED_GETSTATS_COMMAND
+    wait for new bind10 stderr message XFRIN_RECEIVED_COMMAND
     last bindctl output should not contain "error"
 
     When I query statistics zones of bind10 module Xfrin with cmdctl
@@ -175,7 +175,7 @@ Feature: Xfrin incoming notify handling
     # wait until the last stats requesting is finished
     When I query statistics zones of bind10 module Xfrin with cmdctl
     wait for new bind10 stderr message STATS_SEND_STATISTICS_REQUEST
-    wait for new bind10 stderr message XFRIN_RECEIVED_GETSTATS_COMMAND
+    wait for new bind10 stderr message XFRIN_RECEIVED_COMMAND
     last bindctl output should not contain "error"
 
     When I query statistics zones of bind10 module Xfrin with cmdctl
@@ -282,7 +282,7 @@ Feature: Xfrin incoming notify handling
     # wait until the last stats requesting is finished
     When I query statistics zones of bind10 module Xfrin with cmdctl
     wait for new bind10 stderr message STATS_SEND_STATISTICS_REQUEST
-    wait for new bind10 stderr message XFRIN_RECEIVED_GETSTATS_COMMAND
+    wait for new bind10 stderr message XFRIN_RECEIVED_COMMAND
     last bindctl output should not contain "error"
 
     When I query statistics zones of bind10 module Xfrin with cmdctl
@@ -387,7 +387,7 @@ Feature: Xfrin incoming notify handling
     # wait until the last stats requesting is finished
     When I query statistics zones of bind10 module Xfrin with cmdctl
     wait for new bind10 stderr message STATS_SEND_STATISTICS_REQUEST
-    wait for new bind10 stderr message XFRIN_RECEIVED_GETSTATS_COMMAND
+    wait for new bind10 stderr message XFRIN_RECEIVED_COMMAND
     last bindctl output should not contain "error"
 
     When I query statistics zones of bind10 module Xfrin with cmdctl