summaryrefslogtreecommitdiffstats
path: root/nova/console
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-02-20 23:16:10 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-02-20 23:16:10 -0800
commit106eb47eff0551c73b2e90385b9c3a910fec8633 (patch)
treea8155bb559e9cec5ddd9c8dfcfa5ab97958698fe /nova/console
parentbd0ca93866b48a7a65de8b97ab0ac0ac9c737f73 (diff)
downloadnova-106eb47eff0551c73b2e90385b9c3a910fec8633.tar.gz
nova-106eb47eff0551c73b2e90385b9c3a910fec8633.tar.xz
nova-106eb47eff0551c73b2e90385b9c3a910fec8633.zip
fixes for various logging errors and issues
Diffstat (limited to 'nova/console')
-rw-r--r--nova/console/manager.py2
-rw-r--r--nova/console/xvp.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/console/manager.py b/nova/console/manager.py
index 5697e7cb1..57c75cf4f 100644
--- a/nova/console/manager.py
+++ b/nova/console/manager.py
@@ -20,11 +20,11 @@ Console Proxy Service
"""
import functools
-import logging
import socket
from nova import exception
from nova import flags
+from nova import log as logging
from nova import manager
from nova import rpc
from nova import utils
diff --git a/nova/console/xvp.py b/nova/console/xvp.py
index ee66dac46..cd257e0a6 100644
--- a/nova/console/xvp.py
+++ b/nova/console/xvp.py
@@ -20,7 +20,6 @@ XVP (Xenserver VNC Proxy) driver.
"""
import fcntl
-import logging
import os
import signal
import subprocess
@@ -31,6 +30,7 @@ from nova import context
from nova import db
from nova import exception
from nova import flags
+from nova import log as logging
from nova import utils
flags.DEFINE_string('console_xvp_conf_template',