Consolidate eventlet code

This change consolidates eventlet code to a single module.
Importing eventlet drags along alot of other behavior changes
(such as replacing gettaddr with a version that doesn't support
IPv6), so it's safer if all the eventlet code is in one place so
it doesn't get imported when it's not needed, such as when
running under httpd.

blueprint extract-eventlet

Part of fix for bug 1178732

Change-Id: Ia557f8df7f856d7707a9d8c19800ddc36f1572ed

1 files changed, 0 insertions, 83 deletions

diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 80516ea1..4ea05628 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -21,12 +21,8 @@
 """Utility methods for working with WSGI servers."""
 
 import re
-import socket
-import sys
 
-import eventlet.wsgi
 import routes.middleware
-import ssl
 import webob.dec
 import webob.exc
 
@@ -88,85 +84,6 @@ class WritableLogger(object):
         self.logger.log(self.level, msg)
 
 
-class Server(object):
-    """Server class to manage multiple WSGI sockets and applications."""
-
-    def __init__(self, application, host=None, port=None, threads=1000):
-        self.application = application
-        self.host = host or '0.0.0.0'
-        self.port = port or 0
-        self.pool = eventlet.GreenPool(threads)
-        self.socket_info = {}
-        self.greenthread = None
-        self.do_ssl = False
-        self.cert_required = False
-
-    def start(self, key=None, backlog=128):
-        """Run a WSGI server with the given application."""
-        LOG.debug(_('Starting %(arg0)s on %(host)s:%(port)s') %
-                  {'arg0': sys.argv[0],
-                   'host': self.host,
-                   'port': self.port})
-
-        # TODO(dims): eventlet's green dns/socket module does not actually
-        # support IPv6 in getaddrinfo(). We need to get around this in the
-        # future or monitor upstream for a fix
-        info = socket.getaddrinfo(self.host,
-                                  self.port,
-                                  socket.AF_UNSPEC,
-                                  socket.SOCK_STREAM)[0]
-        _socket = eventlet.listen(info[-1],
-                                  family=info[0],
-                                  backlog=backlog)
-        if key:
-            self.socket_info[key] = _socket.getsockname()
-        # SSL is enabled
-        if self.do_ssl:
-            if self.cert_required:
-                cert_reqs = ssl.CERT_REQUIRED
-            else:
-                cert_reqs = ssl.CERT_NONE
-            sslsocket = eventlet.wrap_ssl(_socket, certfile=self.certfile,
-                                          keyfile=self.keyfile,
-                                          server_side=True,
-                                          cert_reqs=cert_reqs,
-                                          ca_certs=self.ca_certs)
-            _socket = sslsocket
-
-        self.greenthread = self.pool.spawn(self._run,
-                                           self.application,
-                                           _socket)
-
-    def set_ssl(self, certfile, keyfile=None, ca_certs=None,
-                cert_required=True):
-        self.certfile = certfile
-        self.keyfile = keyfile
-        self.ca_certs = ca_certs
-        self.cert_required = cert_required
-        self.do_ssl = True
-
-    def kill(self):
-        if self.greenthread:
-            self.greenthread.kill()
-
-    def wait(self):
-        """Wait until all servers have completed running."""
-        try:
-            self.pool.waitall()
-        except KeyboardInterrupt:
-            pass
-
-    def _run(self, application, socket):
-        """Start a WSGI server in a new green thread."""
-        log = logging.getLogger('eventlet.wsgi.server')
-        try:
-            eventlet.wsgi.server(socket, application, custom_pool=self.pool,
-                                 log=WritableLogger(log))
-        except Exception:
-            LOG.exception(_('Server error'))
-            raise
-
-
 class Request(webob.Request):
     pass