Skip to content
Snippets Groups Projects
Commit 7f470d7f authored by Piotr Maślanka's avatar Piotr Maślanka
Browse files

Merge branch 'develop'

parents aef23a0f f7987e68
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@ The changelog is kept as [release notes](https://github.com/smok-serwis/coolamqp
on GitHub. This file serves to only note what changes
have been made so far, between releases.
# v1.2.6
# v1.2.7
* is far more friendly on Windows, which doesn't have epoll
__version__ = '1.2.6'
__version__ = '1.2.7_a2'
......@@ -5,9 +5,8 @@ import threading
import logging
import typing as tp
import os
from coolamqp.objects import Callable
from coolamqp.uplink.listener.epoll_listener import EpollListener
from coolamqp.uplink.listener.select_listener import SelectListener
from coolamqp.objects import Callable
from coolamqp.uplink.listener.base_listener import BaseListener
from coolamqp.utils import prctl_set_name
......@@ -28,12 +27,14 @@ def get_listener_class(): # type: () -> tp.Type[BaseListener]
try:
import gevent.socket
except ImportError:
from coolamqp.uplink.listener.epoll_listener import EpollListener
return EpollListener
import socket
if socket.socket is gevent.socket.socket:
return SelectListener # gevent is active
from coolamqp.uplink.listener.epoll_listener import EpollListener
return EpollListener
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment