Add local storage of context for logging
* adds nova/local.py:store for storing greenthread local data * saves a weak reference to the last context object created * uses the last context object if it exists for logging * Fixes bug 879582 Cc: stable-maintainers Change-Id: Ic373556ce197f2e8e7d23c807a65b12111db96eb
This commit is contained in:
parent
f0c7bc3f30
commit
7858411d04
|
@ -0,0 +1,37 @@
|
||||||
|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||||
|
|
||||||
|
# Copyright 2011 OpenStack LLC.
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
"""Greenthread local storage of variables using weak references"""
|
||||||
|
|
||||||
|
import weakref
|
||||||
|
|
||||||
|
from eventlet import corolocal
|
||||||
|
|
||||||
|
|
||||||
|
class WeakLocal(corolocal.local):
|
||||||
|
def __getattribute__(self, attr):
|
||||||
|
rval = corolocal.local.__getattribute__(self, attr)
|
||||||
|
if rval:
|
||||||
|
rval = rval()
|
||||||
|
return rval
|
||||||
|
|
||||||
|
def __setattr__(self, attr, value):
|
||||||
|
value = weakref.ref(value)
|
||||||
|
return corolocal.local.__setattr__(self, attr, value)
|
||||||
|
|
||||||
|
|
||||||
|
store = WeakLocal()
|
|
@ -1,5 +1,6 @@
|
||||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||||
|
|
||||||
|
# Copyright 2011 OpenStack LLC.
|
||||||
# Copyright 2010 United States Government as represented by the
|
# Copyright 2010 United States Government as represented by the
|
||||||
# Administrator of the National Aeronautics and Space Administration.
|
# Administrator of the National Aeronautics and Space Administration.
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
|
@ -38,6 +39,7 @@ import traceback
|
||||||
|
|
||||||
import nova
|
import nova
|
||||||
from nova import flags
|
from nova import flags
|
||||||
|
from nova import local
|
||||||
from nova import version
|
from nova import version
|
||||||
|
|
||||||
|
|
||||||
|
@ -152,6 +154,8 @@ class NovaLogger(logging.Logger):
|
||||||
"""Extract context from any log call."""
|
"""Extract context from any log call."""
|
||||||
if not extra:
|
if not extra:
|
||||||
extra = {}
|
extra = {}
|
||||||
|
if context is None:
|
||||||
|
context = getattr(local.store, 'context', None)
|
||||||
if context:
|
if context:
|
||||||
extra.update(_dictify_context(context))
|
extra.update(_dictify_context(context))
|
||||||
extra.update({"nova_version": version.version_string_with_vcs()})
|
extra.update({"nova_version": version.version_string_with_vcs()})
|
||||||
|
|
Loading…
Reference in New Issue