diff options
| author | Kenneth Giusti <kgiusti@gmail.com> | 2019-12-09 16:17:07 -0500 |
|---|---|---|
| committer | Kenneth Giusti <kgiusti@gmail.com> | 2019-12-09 16:22:06 -0500 |
| commit | 859e0d4eaa45d75eb822f4a6be46c547187c6358 (patch) | |
| tree | 0a156a856190d2e4716f699e65a4c42fe41f44a5 | |
| parent | 37fabdd895f03d51509aa16e6ae4b344fb909287 (diff) | |
| download | oslo-messaging-859e0d4eaa45d75eb822f4a6be46c547187c6358.tar.gz | |
Revert "Add RPC incoming and reply log"10.4.1
This broke non-rabbitmq message bus drivers. See:
https://bugs.launchpad.net/oslo.messaging/+bug/1855775
This reverts commit b104f254ab43d5e2589e845eff84b1bd096cb42d.
Change-Id: I17a448a768b544482b375b0076889db989e03e8c
| -rw-r--r-- | oslo_messaging/_drivers/impl_fake.py | 2 | ||||
| -rw-r--r-- | oslo_messaging/rpc/server.py | 18 | ||||
| -rw-r--r-- | oslo_messaging/tests/rpc/test_server.py | 2 |
3 files changed, 1 insertions, 21 deletions
diff --git a/oslo_messaging/_drivers/impl_fake.py b/oslo_messaging/_drivers/impl_fake.py index dc6439d..c5476fd 100644 --- a/oslo_messaging/_drivers/impl_fake.py +++ b/oslo_messaging/_drivers/impl_fake.py @@ -16,7 +16,6 @@ import copy import threading import time -import uuid from oslo_serialization import jsonutils from six import moves @@ -30,7 +29,6 @@ class FakeIncomingMessage(base.RpcIncomingMessage): super(FakeIncomingMessage, self).__init__(ctxt, message) self.requeue_callback = requeue self._reply_q = reply_q - self.msg_id = str(uuid.uuid4()) def reply(self, reply=None, failure=None): if self._reply_q: diff --git a/oslo_messaging/rpc/server.py b/oslo_messaging/rpc/server.py index f1deff7..b16d77f 100644 --- a/oslo_messaging/rpc/server.py +++ b/oslo_messaging/rpc/server.py @@ -122,7 +122,6 @@ A simple example of an RPC server with multiple endpoints might be:: import logging import sys -import time from oslo_messaging import exceptions from oslo_messaging.rpc import dispatcher as rpc_dispatcher @@ -152,12 +151,6 @@ class RPCServer(msg_server.MessageHandlingServer): def _process_incoming(self, incoming): message = incoming[0] - rpc_method = message.message.get('method') - start = time.time() - LOG.debug("Receive incoming message with id %(msg_id)s and " - "method: %(method)s.", - {"msg_id": message.msg_id, - "method": rpc_method}) # TODO(sileht): We should remove that at some point and do # this directly in the driver @@ -183,19 +176,8 @@ class RPCServer(msg_server.MessageHandlingServer): try: if failure is None: message.reply(res) - LOG.debug("Replied success message with id %(msg_id)s and " - "method: %(method)s. Time elapsed: %(elapsed).3f", - {"msg_id": message.msg_id, - "method": rpc_method, - "elapsed": (time.time() - start)}) else: message.reply(failure=failure) - LOG.debug("Replied failure for incoming message with " - "id %(msg_id)s and method: %(method)s. " - "Time elapsed: %(elapsed).3f", - {"msg_id": message.msg_id, - "method": rpc_method, - "elapsed": (time.time() - start)}) except exceptions.MessageUndeliverable as e: LOG.exception( "MessageUndeliverable error, " diff --git a/oslo_messaging/tests/rpc/test_server.py b/oslo_messaging/tests/rpc/test_server.py index cf2d4ba..693e88a 100644 --- a/oslo_messaging/tests/rpc/test_server.py +++ b/oslo_messaging/tests/rpc/test_server.py @@ -400,7 +400,7 @@ class TestRPCServer(test_utils.BaseTestCase, ServerSetupMixin): except Exception as ex: self.assertIsInstance(ex, ValueError) self.assertEqual('dsfoo', str(ex)) - self.assertTrue(len(debugs) == 2) + self.assertTrue(len(debugs) == 0) self.assertGreater(len(errors), 0) else: self.assertTrue(False) |