summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-06-21 00:54:14 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-06-21 00:54:14 -0400
commitc80dbac0b9563fb7afdc1a9ec3f0a851e2673236 (patch)
treea90697b5a0e55b59d935b5e6e003a075a5a22df8
parent679b00759ab2f183c3372465baa7daab1abeb25e (diff)
log -> logging to keep with convention
-rw-r--r--nova/wsgi.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py
index 3c4f8a5da..2991d1529 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -35,7 +35,7 @@ from paste import deploy
from nova import exception
from nova import flags
-from nova import log
+from nova import log as logging
from nova import utils
@@ -43,7 +43,7 @@ eventlet.patcher.monkey_patch()
FLAGS = flags.FLAGS
-LOG = log.getLogger('nova.wsgi')
+LOG = logging.getLogger('nova.wsgi')
class Server(object):
@@ -72,7 +72,7 @@ class Server(object):
"""
pool = eventlet.GreenPool(self.pool_size)
- logger = log.WritableLogger(log.getLogger("eventlet.wsgi.server"))
+ logger = logging.WritableLogger(logging.getLogger("eventlet.wsgi"))
eventlet.wsgi.server(socket, self.app, custom_pool=pool, log=logger)
def start(self, host, port, backlog=128):