diff options
| author | Dan Prince <dprince@redhat.com> | 2013-03-02 10:19:40 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2013-03-02 13:03:49 -0500 |
| commit | e6f6a61d8da252c8c13da09ddf092c5c23ac61c7 (patch) | |
| tree | 37e58e8d95ac2842df72f24758fc1f362336e247 /nova/openstack | |
| parent | 041e8ccd74bf7537163abf2de51a5ce68dab3a4d (diff) | |
| download | nova-e6f6a61d8da252c8c13da09ddf092c5c23ac61c7.tar.gz nova-e6f6a61d8da252c8c13da09ddf092c5c23ac61c7.tar.xz nova-e6f6a61d8da252c8c13da09ddf092c5c23ac61c7.zip | |
Don't LOG.error on max_depth (by default).
Reverts part of 7b206ad which added an extra LOG.error
statement when max_depth is hit.
This is causing spurious errors to get logged when making
some Nova requests.
Fixes LP Bug #1140133
Change-Id: I0fff47d9c53c63345ae273a4d20a2bacb27f12e5
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, |