summaryrefslogtreecommitdiffstats
path: root/nova/wsgi.py
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-02-25 01:31:02 +0000
committerRick Harris <rick.harris@rackspace.com>2011-02-25 01:31:02 +0000
commitc8345c9ebc0357f1fe06ac520f286f036cb0596c (patch)
tree197e6c852db619cf03800a77585637d8671d3d71 /nova/wsgi.py
parent05d135be0c0d8a90a97d62005a101345964800cf (diff)
parentc8b630a78e955756e77be8879c1da863a5357ea0 (diff)
downloadnova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.tar.gz
nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.tar.xz
nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.zip
Merging trunk, small fixes
Diffstat (limited to 'nova/wsgi.py')
-rw-r--r--nova/wsgi.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py
index e01cc1e1e..1eb66d067 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -59,7 +59,6 @@ class Server(object):
"""Server class to manage multiple WSGI sockets and applications."""
def __init__(self, threads=1000):
- logging.basicConfig()
self.pool = eventlet.GreenPool(threads)
def start(self, application, port, host='0.0.0.0', backlog=128):
@@ -515,10 +514,3 @@ def load_paste_app(filename, appname):
except LookupError:
pass
return app
-
-
-def paste_config_to_flags(config, mixins):
- for k, v in mixins.iteritems():
- value = config.get(k, v)
- converted_value = FLAGS[k].parser.Parse(value)
- setattr(FLAGS, k, converted_value)