Update Keystone code from official Github repository with branch Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

2 files changed, 19 insertions, 6 deletions

diff --git a/keystone-moon/keystone/common/environment/__init__.py b/keystone-moon/keystone/common/environment/__init__.py
index da1de890..3edf6b0b 100644
--- a/keystone-moon/keystone/common/environment/__init__.py
+++ b/keystone-moon/keystone/common/environment/__init__.py
@@ -17,6 +17,7 @@ import os
 
 from oslo_log import log
 
+
 LOG = log.getLogger(__name__)
 
 
@@ -93,7 +94,7 @@ def use_eventlet(monkeypatch_thread=None):
 def use_stdlib():
     global httplib, subprocess
 
-    import httplib as _httplib
+    import six.moves.http_client as _httplib
     import subprocess as _subprocess
 
     httplib = _httplib
diff --git a/keystone-moon/keystone/common/environment/eventlet_server.py b/keystone-moon/keystone/common/environment/eventlet_server.py
index 639e074a..398952e1 100644
--- a/keystone-moon/keystone/common/environment/eventlet_server.py
+++ b/keystone-moon/keystone/common/environment/eventlet_server.py
@@ -25,12 +25,17 @@ import sys
 import eventlet
 import eventlet.wsgi
 import greenlet
+from oslo_config import cfg
 from oslo_log import log
 from oslo_log import loggers
+from oslo_service import service
 
 from keystone.i18n import _LE, _LI
 
 
+CONF = cfg.CONF
+
+
 LOG = log.getLogger(__name__)
 
 # The size of a pool that is used to spawn a single green thread in which
@@ -62,7 +67,7 @@ class EventletFilteringLogger(loggers.WritableLogger):
             self.logger.log(self.level, msg.rstrip())
 
 
-class Server(object):
+class Server(service.ServiceBase):
     """Server class to manage multiple WSGI sockets and applications."""
 
     def __init__(self, application, host=None, port=None, keepalive=False,
@@ -173,7 +178,7 @@ class Server(object):
 
         The service interface is used by the launcher when receiving a
         SIGHUP. The service interface is defined in
-        keystone.openstack.common.service.Service.
+        oslo_service.service.Service.
 
         Keystone does not need to do anything here.
         """
@@ -182,10 +187,17 @@ class Server(object):
     def _run(self, application, socket):
         """Start a WSGI server with a new green thread pool."""
         logger = log.getLogger('eventlet.wsgi.server')
+
+        # NOTE(dolph): [eventlet_server] client_socket_timeout is required to
+        # be an integer in keystone.conf, but in order to make
+        # eventlet.wsgi.server() wait forever, we pass None instead of 0.
+        socket_timeout = CONF.eventlet_server.client_socket_timeout or None
+
         try:
-            eventlet.wsgi.server(socket, application,
-                                 log=EventletFilteringLogger(logger),
-                                 debug=False)
+            eventlet.wsgi.server(
+                socket, application, log=EventletFilteringLogger(logger),
+                debug=False, keepalive=CONF.eventlet_server.wsgi_keep_alive,
+                socket_timeout=socket_timeout)
         except greenlet.GreenletExit:
             # Wait until all servers have completed running
             pass