diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-20 00:56:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-20 00:56:21 +0000 |
| commit | bbd81be940f88b97f9ba309e4cb4b41f70a9da3d (patch) | |
| tree | 904ac9ac16029a2f13e64544f239d18f2b30231f /openstack/common/rootwrap/cmd.py | |
| parent | cdb376cc893ffa89263786774b8afee571b536b9 (diff) | |
| parent | e700d926f7d8fe2f57e53b93361aaf281bebc8ed (diff) | |
| download | oslo-bbd81be940f88b97f9ba309e4cb4b41f70a9da3d.tar.gz oslo-bbd81be940f88b97f9ba309e4cb4b41f70a9da3d.tar.xz oslo-bbd81be940f88b97f9ba309e4cb4b41f70a9da3d.zip | |
Merge "Replaces standard logging with common logging"
Diffstat (limited to 'openstack/common/rootwrap/cmd.py')
| -rwxr-xr-x | openstack/common/rootwrap/cmd.py | 9 |
1 files changed, 6 insertions, 3 deletions
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)) |