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:
@@ -1,5 +1,6 @@
|
||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
# Copyright 2011 OpenStack LLC.
|
||||
# Copyright 2010 United States Government as represented by the
|
||||
# Administrator of the National Aeronautics and Space Administration.
|
||||
# All Rights Reserved.
|
||||
@@ -38,6 +39,7 @@ import traceback
|
||||
|
||||
import nova
|
||||
from nova import flags
|
||||
from nova import local
|
||||
from nova import version
|
||||
|
||||
|
||||
@@ -152,6 +154,8 @@ class NovaLogger(logging.Logger):
|
||||
"""Extract context from any log call."""
|
||||
if not extra:
|
||||
extra = {}
|
||||
if context is None:
|
||||
context = getattr(local.store, 'context', None)
|
||||
if context:
|
||||
extra.update(_dictify_context(context))
|
||||
extra.update({"nova_version": version.version_string_with_vcs()})
|
||||
|
||||
Reference in New Issue
Block a user