dns: EVENTLET_NO_GREENDNS option is back, green is still default
Sorry for negation in name, perfectionists want EVENTLET_GREEN_DNS=no but I figured it's lesser evil than reviving same behavior under different name. This works around https://github.com/eventlet/eventlet/issues/383 at the cost of resolving blocking other greenthreads.
This commit is contained in:
parent
0fdb1154cb
commit
f9e3ff7f06
@ -1,6 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import warnings
|
|
||||||
|
|
||||||
__import__('eventlet.green._socket_nodns')
|
__import__('eventlet.green._socket_nodns')
|
||||||
__socket = sys.modules['eventlet.green._socket_nodns']
|
__socket = sys.modules['eventlet.green._socket_nodns']
|
||||||
@ -18,18 +17,13 @@ from eventlet.patcher import slurp_properties
|
|||||||
slurp_properties(__socket, globals(), srckeys=dir(__socket))
|
slurp_properties(__socket, globals(), srckeys=dir(__socket))
|
||||||
|
|
||||||
|
|
||||||
if os.environ.get("EVENTLET_NO_GREENDNS", '').lower() == "yes":
|
if os.environ.get("EVENTLET_NO_GREENDNS", '').lower() != 'yes':
|
||||||
warnings.warn(
|
from eventlet.support import greendns
|
||||||
'EVENTLET_NO_GREENDNS is noop, dnspython is bundled and DNS resolution is always green',
|
gethostbyname = greendns.gethostbyname
|
||||||
DeprecationWarning,
|
getaddrinfo = greendns.getaddrinfo
|
||||||
stacklevel=2,
|
gethostbyname_ex = greendns.gethostbyname_ex
|
||||||
)
|
getnameinfo = greendns.getnameinfo
|
||||||
|
del greendns
|
||||||
from eventlet.support import greendns
|
|
||||||
gethostbyname = greendns.gethostbyname
|
|
||||||
getaddrinfo = greendns.getaddrinfo
|
|
||||||
gethostbyname_ex = greendns.gethostbyname_ex
|
|
||||||
getnameinfo = greendns.getnameinfo
|
|
||||||
|
|
||||||
|
|
||||||
def create_connection(address,
|
def create_connection(address,
|
||||||
|
Loading…
Reference in New Issue
Block a user