Merge "Replaces standard logging with common logging"

6 files changed, 14 insertions, 8 deletions

diff --git a/openstack/common/network_utils.py b/openstack/common/network_utils.py
index 5224e01..fc7b9a8 100644
--- a/openstack/common/network_utils.py
+++ b/openstack/common/network_utils.py
@@ -19,7 +19,8 @@
 Network-related utilities and helper functions.
 """
 
-import logging
+from openstack.common import log as logging
+
 
 LOG = logging.getLogger(__name__)
 
diff --git a/openstack/common/policy.py b/openstack/common/policy.py
index 76830db..6126774 100644
--- a/openstack/common/policy.py
+++ b/openstack/common/policy.py
@@ -57,7 +57,6 @@ as it allows particular rules to be explicitly disabled.
 """
 
 import abc
-import logging
 import re
 import urllib
 
@@ -65,6 +64,7 @@ import urllib2
 
 from openstack.common.gettextutils import _
 from openstack.common import jsonutils
+from openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/openstack/common/processutils.py b/openstack/common/processutils.py
index 2b67d15..0074a76 100644
--- a/openstack/common/processutils.py
+++ b/openstack/common/processutils.py
@@ -19,7 +19,6 @@
 System-level utilities and helper functions.
 """
 
-import logging
 import random
 import shlex
 
@@ -27,6 +26,7 @@ from eventlet.green import subprocess
 from eventlet import greenthread
 
 from openstack.common.gettextutils import _
+from openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/openstack/common/rootwrap/cmd.py b/openstack/common/rootwrap/cmd.py
index 92552f1..23986ac 100755
--- a/openstack/common/rootwrap/cmd.py
+++ b/openstack/common/rootwrap/cmd.py
@@ -34,13 +34,16 @@
 """
 
 import ConfigParser
-import logging
 import os
 import pwd
 import signal
 import subprocess
 import sys
 
+from openstack.common import log as logging
+
+
+LOG = logging.getLogger(__name__)
 
 RC_UNAUTHORIZED = 99
 RC_NOCOMMAND = 98
@@ -57,7 +60,7 @@ def _subprocess_setup():
 def _exit_error(execname, message, errorcode, log=True):
     print "%s: %s" % (execname, message)
     if log:
-        logging.error(message)
+        LOG.error(message)
     sys.exit(errorcode)
 
 
@@ -104,7 +107,7 @@ def main():
             command = filtermatch.get_command(userargs,
                                               exec_dirs=config.exec_dirs)
             if config.use_syslog:
-                logging.info("(%s > %s) Executing %s (filter match = %s)" % (
+                LOG.info("(%s > %s) Executing %s (filter match = %s)" % (
                     os.getlogin(), pwd.getpwuid(os.getuid())[0],
                     command, filtermatch.name))
 
diff --git a/openstack/common/rpc/__init__.py b/openstack/common/rpc/__init__.py
index b429a83..325c036 100644
--- a/openstack/common/rpc/__init__.py
+++ b/openstack/common/rpc/__init__.py
@@ -26,13 +26,13 @@ For some wrappers that add message versioning to rpc, see:
 """
 
 import inspect
-import logging
 
 from oslo.config import cfg
 
 from openstack.common.gettextutils import _
 from openstack.common import importutils
 from openstack.common import local
+from openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/openstack/common/strutils.py b/openstack/common/strutils.py
index ecf3cfd..5ecfb80 100644
--- a/openstack/common/strutils.py
+++ b/openstack/common/strutils.py
@@ -19,9 +19,11 @@
 System-level utilities and helper functions.
 """
 
-import logging
 import sys
 
+from openstack.common import log as logging
+
+
 LOG = logging.getLogger(__name__)