Merge "Revert common logging use in rootwrap"

1 files changed, 3 insertions, 6 deletions

diff --git a/openstack/common/rootwrap/cmd.py b/openstack/common/rootwrap/cmd.py
index e8f4dd0..500f6c9 100755
--- a/openstack/common/rootwrap/cmd.py
+++ b/openstack/common/rootwrap/cmd.py
@@ -36,16 +36,13 @@
 from __future__ import print_function
 
 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
@@ -62,7 +59,7 @@ def _subprocess_setup():
 def _exit_error(execname, message, errorcode, log=True):
     print("%s: %s" % (execname, message))
     if log:
-        LOG.error(message)
+        logging.error(message)
     sys.exit(errorcode)
 
 
@@ -109,7 +106,7 @@ def main():
             command = filtermatch.get_command(userargs,
                                               exec_dirs=config.exec_dirs)
             if config.use_syslog:
-                LOG.info("(%s > %s) Executing %s (filter match = %s)" % (
+                logging.info("(%s > %s) Executing %s (filter match = %s)" % (
                     os.getlogin(), pwd.getpwuid(os.getuid())[0],
                     command, filtermatch.name))