From 4252eb02779a8399740fd04a37ec67ebd274d866 Mon Sep 17 00:00:00 2001
From: Stanislav Kudriashev <skudriashev@griddynamics.com>
Date: Wed, 19 Mar 2014 14:49:13 +0200
Subject: [PATCH] Improve logging for proxy publish

Added message type logging during proxy publishing.

Change-Id: Iddbfab0e4dd6e9f5b6d1c3ea5c86029700a2d66d
---
 taskflow/engines/worker_based/executor.py         | 1 -
 taskflow/engines/worker_based/protocol.py         | 2 +-
 taskflow/engines/worker_based/proxy.py            | 1 +
 taskflow/engines/worker_based/server.py           | 1 -
 taskflow/tests/unit/worker_based/test_protocol.py | 3 ++-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/taskflow/engines/worker_based/executor.py b/taskflow/engines/worker_based/executor.py
index 65d6ccd6..a8f2da85 100644
--- a/taskflow/engines/worker_based/executor.py
+++ b/taskflow/engines/worker_based/executor.py
@@ -152,7 +152,6 @@ class WorkerTaskExecutor(executor.TaskExecutorBase):
 
     def _publish_request(self, request, topic):
         """Publish request to a given topic."""
-        LOG.debug("Sending request: %s" % request)
         try:
             self._proxy.publish(msg=request,
                                 routing_key=topic,
diff --git a/taskflow/engines/worker_based/protocol.py b/taskflow/engines/worker_based/protocol.py
index 3c353cd3..f93e815c 100644
--- a/taskflow/engines/worker_based/protocol.py
+++ b/taskflow/engines/worker_based/protocol.py
@@ -68,7 +68,7 @@ class Message(object):
     """Base class for all message types."""
 
     def __str__(self):
-        return str(self.to_dict())
+        return "<%s> %s" % (self.TYPE, self.to_dict())
 
     @abc.abstractmethod
     def to_dict(self):
diff --git a/taskflow/engines/worker_based/proxy.py b/taskflow/engines/worker_based/proxy.py
index 7fc3fb7d..1265f9e4 100644
--- a/taskflow/engines/worker_based/proxy.py
+++ b/taskflow/engines/worker_based/proxy.py
@@ -69,6 +69,7 @@ class Proxy(object):
 
     def publish(self, msg, routing_key, **kwargs):
         """Publish message to the named exchange with routing key."""
+        LOG.debug("Sending %s", msg)
         if isinstance(routing_key, six.string_types):
             routing_keys = [routing_key]
         else:
diff --git a/taskflow/engines/worker_based/server.py b/taskflow/engines/worker_based/server.py
index ca858a49..a72ed0c5 100644
--- a/taskflow/engines/worker_based/server.py
+++ b/taskflow/engines/worker_based/server.py
@@ -114,7 +114,6 @@ class Server(object):
     def _reply(self, reply_to, task_uuid, state=pr.FAILURE, **kwargs):
         """Send reply to the `reply_to` queue."""
         response = pr.Response(state, **kwargs)
-        LOG.debug("Sending reply: %s", response)
         try:
             self._proxy.publish(response, reply_to, correlation_id=task_uuid)
         except Exception:
diff --git a/taskflow/tests/unit/worker_based/test_protocol.py b/taskflow/tests/unit/worker_based/test_protocol.py
index 1f31da0e..c0709ba7 100644
--- a/taskflow/tests/unit/worker_based/test_protocol.py
+++ b/taskflow/tests/unit/worker_based/test_protocol.py
@@ -63,7 +63,8 @@ class TestProtocol(test.TestCase):
 
     def test_str(self):
         request = self.request()
-        self.assertEqual(str(request), str(request.to_dict()))
+        self.assertEqual(str(request),
+                         "<REQUEST> %s" % self.request_to_dict())
 
     def test_repr(self):
         expected = '%s:%s' % (self.task.name, self.task_action)