diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-04 09:08:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-04 09:08:46 +0000 |
| commit | bcafae59eeae7989ac56ed25c5d96e775d7b8e9e (patch) | |
| tree | 5b6be85feb2c8d4a299a22b55f609bf856eaacc5 /nova/openstack | |
| parent | a9ffc4760bf5f5bc782b53d47f9c53948a868df2 (diff) | |
| parent | e6f6a61d8da252c8c13da09ddf092c5c23ac61c7 (diff) | |
| download | nova-bcafae59eeae7989ac56ed25c5d96e775d7b8e9e.tar.gz nova-bcafae59eeae7989ac56ed25c5d96e775d7b8e9e.tar.xz nova-bcafae59eeae7989ac56ed25c5d96e775d7b8e9e.zip | |
Merge "Don't LOG.error on max_depth (by default)."
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/jsonutils.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nova/openstack/common/jsonutils.py b/nova/openstack/common/jsonutils.py index b06055117..3a2f27730 100644 --- a/nova/openstack/common/jsonutils.py +++ b/nova/openstack/common/jsonutils.py @@ -38,14 +38,10 @@ import functools import inspect import itertools import json -import logging import xmlrpclib -from nova.openstack.common.gettextutils import _ from nova.openstack.common import timeutils -LOG = logging.getLogger(__name__) - def to_primitive(value, convert_instances=False, convert_datetime=True, level=0, max_depth=3): @@ -85,8 +81,6 @@ def to_primitive(value, convert_instances=False, convert_datetime=True, return 'mock' if level > max_depth: - LOG.error(_('Max serialization depth exceeded on object: %d %s'), - level, value) return '?' # The try block may not be necessary after the class check above, |