diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-10 14:15:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-10 14:15:39 +0000 |
| commit | 22ccc58df8886531b649a8d95251bfd02d40c62a (patch) | |
| tree | c9d1f634d31c3901a7b795fa2d76aee8c09dec63 /openstack/common/log.py | |
| parent | ecebfb2b2391439a502f4db7801b7992f44e1851 (diff) | |
| parent | 85f6662f25e9d2696ec6086a1423c1b93a58cb0c (diff) | |
| download | oslo-22ccc58df8886531b649a8d95251bfd02d40c62a.tar.gz oslo-22ccc58df8886531b649a8d95251bfd02d40c62a.tar.xz oslo-22ccc58df8886531b649a8d95251bfd02d40c62a.zip | |
Merge "Switch common files to using jsonutils."
Diffstat (limited to 'openstack/common/log.py')
| -rw-r--r-- | openstack/common/log.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py index 9d8bddf..348f3ab 100644 --- a/openstack/common/log.py +++ b/openstack/common/log.py @@ -32,7 +32,6 @@ It also allows setting of formatting information through conf. import cStringIO import inspect import itertools -import json import logging import logging.config import logging.handlers @@ -42,6 +41,7 @@ import sys import traceback from openstack.common import cfg +from openstack.common import jsonutils from openstack.common import local from openstack.common import notifier @@ -241,7 +241,7 @@ class JSONFormatter(logging.Formatter): if record.exc_info: message['traceback'] = self.formatException(record.exc_info) - return json.dumps(message) + return jsonutils.dumps(message) class PublishErrorsHandler(logging.Handler): |