From 53aa3a57d976498fde802266f97830c036f5843f Mon Sep 17 00:00:00 2001 From: Oleksii Zamiatin Date: Tue, 12 Apr 2016 14:18:54 +0300 Subject: [PATCH] Use eventletutils to check is_monkey_patched Move monkey_patched check to oslo utils by the change Depends-On: Ie24ecb54946bfba465d293185ebfda25691a8701 Reduce the function implementation from pika driver. Change-Id: Ic6cf38bc842f4b829e92a20d76c1f1b64a99968c --- .../_drivers/pika_driver/pika_commons.py | 14 -------------- oslo_messaging/_drivers/pika_driver/pika_engine.py | 3 ++- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/oslo_messaging/_drivers/pika_driver/pika_commons.py b/oslo_messaging/_drivers/pika_driver/pika_commons.py index f032a33..0737043 100644 --- a/oslo_messaging/_drivers/pika_driver/pika_commons.py +++ b/oslo_messaging/_drivers/pika_driver/pika_commons.py @@ -14,7 +14,6 @@ import select import socket -import sys from oslo_utils import timeutils from pika import exceptions as pika_exceptions @@ -32,16 +31,3 @@ PIKA_CONNECTIVITY_ERRORS = ( EXCEPTIONS_MODULE = 'exceptions' if six.PY2 else 'builtins' INFINITE_STOP_WATCH = timeutils.StopWatch(duration=None).start() - - -def is_eventlet_monkey_patched(module): - """Determines safely is eventlet patching for module enabled or not - - :param module: String, module name - :return Bool, True if module is patched, False otherwise - """ - - if 'eventlet.patcher' not in sys.modules: - return False - import eventlet.patcher - return eventlet.patcher.is_monkey_patched(module) diff --git a/oslo_messaging/_drivers/pika_driver/pika_engine.py b/oslo_messaging/_drivers/pika_driver/pika_engine.py index 65e87fc..3c29f30 100644 --- a/oslo_messaging/_drivers/pika_driver/pika_engine.py +++ b/oslo_messaging/_drivers/pika_driver/pika_engine.py @@ -18,6 +18,7 @@ import threading import time from oslo_log import log as logging +from oslo_utils import eventletutils import pika from pika import credentials as pika_credentials @@ -248,7 +249,7 @@ class PikaEngine(object): # Note(dukhlov): we need to force select poller usage in case when # 'thread' module is monkey patched becase current eventlet # implementation does not support patching of poll/epoll/kqueue - if pika_drv_cmns.is_eventlet_monkey_patched("thread"): + if eventletutils.is_monkey_patched("thread"): from pika.adapters import select_connection select_connection.SELECT_TYPE = "select"