openstack/deb-python-eventlet
Code Issues Proposed changes

Added environment variable to disable greendns if needed, acknowledgement, cleaned up imports in greendns.

Browse Source
This commit is contained in:
Ryan Williams
2010-06-24 22:33:09 -07:00
parent e0ef26975e
commit 4f5c6c26a6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -59,3 +59,4 @@ Thanks To
* David Ziegler, reporting issue #53 * David Ziegler, reporting issue #53
* Favo Yang, twisted hub patch * Favo Yang, twisted hub patch
* Schmir, patch that fixes readline method with chunked encoding in wsgi.py * Schmir, patch that fixes readline method with chunked encoding in wsgi.py
* Slide, for open-sourcing gogreen

5
eventlet/green/socket.py
View File

@@ -17,9 +17,10 @@ __patched__ = __socket.__patched__ + ['gethostbyname', 'getaddrinfo']
greendns = None greendns = None
try: if os.environ.get("EVENTLET_NO_GREENDNS",'').lower() != "yes":
try:
from eventlet.support import greendns from eventlet.support import greendns
except ImportError: except ImportError:
pass pass
__original_gethostbyname__ = __socket.gethostbyname __original_gethostbyname__ = __socket.gethostbyname

5
eventlet/support/greendns.py
View File

@@ -35,7 +35,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import random
from eventlet import patcher from eventlet import patcher
from eventlet.green import _socket_nodns from eventlet.green import _socket_nodns
from eventlet.green import time from eventlet.green import time
@@ -43,8 +42,8 @@ from eventlet.green import select
__imports = [] __imports = []
for package in ('dns', 'dns.query', 'dns.exception', 'dns.inet', for package in ('dns', 'dns.query', 'dns.exception', 'dns.inet',
'dns.message', 'dns.name', 'dns.rdata', 'dns.rdataset', 'dns.message', 'dns.rdatatype', 'dns.resolver',
'dns.rdatatype', 'dns.resolver', 'dns.reversename'): 'dns.reversename'):
__imports.append('%(pkg)s = patcher.import_patched(\'%(pkg)s\', socket=_socket_nodns, time=time, select=select)' % dict(pkg=package)) __imports.append('%(pkg)s = patcher.import_patched(\'%(pkg)s\', socket=_socket_nodns, time=time, select=select)' % dict(pkg=package))
exec '\n'.join(__imports) exec '\n'.join(__imports)