From 5f059f006b655970b1ef12977146c64bc9b60894 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Wed, 29 Nov 2017 08:44:36 -0800 Subject: [PATCH] Renaming "Consumer helper" threads in Pub/Sub. (#4476) Now names will show up in logs as Thread-ConsumerHelper-CallbackRequestsWorker Thread-ConsumerHelper-ConsumeBidirectionalStream instead of as Consumer helper: callback requests worker Consumer helper: consume bidirectional stream --- pubsub/google/cloud/pubsub_v1/subscriber/_consumer.py | 2 +- pubsub/google/cloud/pubsub_v1/subscriber/_helper_threads.py | 2 +- pubsub/google/cloud/pubsub_v1/subscriber/policy/thread.py | 2 +- pubsub/tests/unit/pubsub_v1/subscriber/test_consumer.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/_consumer.py b/pubsub/google/cloud/pubsub_v1/subscriber/_consumer.py index 77c96f06db22..c3c690a92c91 100644 --- a/pubsub/google/cloud/pubsub_v1/subscriber/_consumer.py +++ b/pubsub/google/cloud/pubsub_v1/subscriber/_consumer.py @@ -254,7 +254,7 @@ def start_consuming(self): self.active = True self._exiting.clear() self.helper_threads.start( - 'consume bidirectional stream', + 'ConsumeBidirectionalStream', self._request_queue, self._blocking_consume, ) diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/_helper_threads.py b/pubsub/google/cloud/pubsub_v1/subscriber/_helper_threads.py index 054afd76727f..c88ca2487a89 100644 --- a/pubsub/google/cloud/pubsub_v1/subscriber/_helper_threads.py +++ b/pubsub/google/cloud/pubsub_v1/subscriber/_helper_threads.py @@ -62,7 +62,7 @@ def start(self, name, queue, target, *args, **kwargs): """ # Create and start the helper thread. thread = threading.Thread( - name='Consumer helper: {}'.format(name), + name='Thread-ConsumerHelper-{}'.format(name), target=target, *args, **kwargs diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/policy/thread.py b/pubsub/google/cloud/pubsub_v1/subscriber/policy/thread.py index ec2710cb9096..6c678dda3cd4 100644 --- a/pubsub/google/cloud/pubsub_v1/subscriber/policy/thread.py +++ b/pubsub/google/cloud/pubsub_v1/subscriber/policy/thread.py @@ -149,7 +149,7 @@ def open(self, callback): _LOGGER.debug('Starting callback requests worker.') self._callback = callback self._consumer.helper_threads.start( - 'callback requests worker', + 'CallbackRequestsWorker', self._request_queue, self._callback_requests, ) diff --git a/pubsub/tests/unit/pubsub_v1/subscriber/test_consumer.py b/pubsub/tests/unit/pubsub_v1/subscriber/test_consumer.py index c0a0828c8a1e..52038a891d94 100644 --- a/pubsub/tests/unit/pubsub_v1/subscriber/test_consumer.py +++ b/pubsub/tests/unit/pubsub_v1/subscriber/test_consumer.py @@ -109,7 +109,7 @@ def test_start_consuming(): assert consumer._exiting.is_set() is False assert consumer.active is True start.assert_called_once_with( - 'consume bidirectional stream', + 'ConsumeBidirectionalStream', consumer._request_queue, consumer._blocking_consume, )