summaryrefslogtreecommitdiff
path: root/eventlet/support
diff options
context:
space:
mode:
authorR. Tyler Ballance <tyler@monkeypox.org>2010-08-27 14:00:03 -0700
committerR. Tyler Ballance <tyler@monkeypox.org>2010-08-27 14:00:03 -0700
commit1cfdd41f7d108cdeb6eac9ce6037965248d3cff2 (patch)
treea806fdc9b4fcae5ee3edf9f18921d8fddc4bf87c /eventlet/support
parentd4bbb32707212dbaa3e588e28d09e7a3a408f45f (diff)
downloadeventlet-1cfdd41f7d108cdeb6eac9ce6037965248d3cff2.tar.gz
Move socket.create_connection to green.socket to avoid blocking getaddrinfo() call
Given the order of imports and monkey-patching, even when using greendns the `getaddrinfo()` call inside of _socket_nodns.create_connection would use the unpatched (i.e. non-green) version of getaddrinfo, inadvertantly blocking the process in some situations
Diffstat (limited to 'eventlet/support')
-rw-r--r--eventlet/support/greendns.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/eventlet/support/greendns.py b/eventlet/support/greendns.py
index 81eed13..8720f7d 100644
--- a/eventlet/support/greendns.py
+++ b/eventlet/support/greendns.py
@@ -41,14 +41,14 @@ from eventlet.green import time
from eventlet.green import select
dns = patcher.import_patched('dns',
- socket=_socket_nodns,
- time=time,
+ socket=_socket_nodns,
+ time=time,
select=select)
for pkg in ('dns.query', 'dns.exception', 'dns.inet', 'dns.message',
'dns.rdatatype','dns.resolver', 'dns.reversename'):
setattr(dns, pkg.split('.')[1], patcher.import_patched(pkg,
- socket=_socket_nodns,
- time=time,
+ socket=_socket_nodns,
+ time=time,
select=select))
socket = _socket_nodns