Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
coolamqp
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
public
coolamqp
Commits
7f470d7f
Commit
7f470d7f
authored
4 years ago
by
Piotr Maślanka
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop'
parents
aef23a0f
f7987e68
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+2
-1
2 additions, 1 deletion
CHANGELOG.md
coolamqp/__init__.py
+1
-1
1 addition, 1 deletion
coolamqp/__init__.py
coolamqp/uplink/listener/thread.py
+3
-2
3 additions, 2 deletions
coolamqp/uplink/listener/thread.py
with
6 additions
and
4 deletions
CHANGELOG.md
+
2
−
1
View file @
7f470d7f
...
...
@@ -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
This diff is collapsed.
Click to expand it.
coolamqp/__init__.py
+
1
−
1
View file @
7f470d7f
__version__
=
'
1.2.
6
'
__version__
=
'
1.2.
7_a2
'
This diff is collapsed.
Click to expand it.
coolamqp/uplink/listener/thread.py
+
3
−
2
View file @
7f470d7f
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment