openstack
/
glance
Code Issues Proposed changes

Use openstack.common.log to log request id 

* Log request id from the request context for glance-api
  and glance-registry
* Further integrate with the common log module by storing RequestContext
  objects in thread-local storage so loggers can acces their attributes
* Move request id formatting into the request module so it appears with
  the preferred prefix (req-) in logs
* Implement bp glance-request-tracking

Change-Id: I2095ad16fef6b4bc8e49229c9f0326da8c743ff7
This commit is contained in:
Brian Waldon 2012-07-13 10:49:41 -07:00
parent 8f745a25a1
commit a0689d2b45
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/glance-api
View File

@ -39,6 +39,7 @@ gettext.install('glance', unicode=1)
from glance.common import config
from glance.common import wsgi
from glance.common import exception
from glance.openstack.common import log
def fail(returncode, e):
@ -49,6 +50,7 @@ def fail(returncode, e):
if __name__ == '__main__':
try:
config.parse_args()
log.setup('glance')
app = config.load_paste_app()

2
bin/glance-registry
View File

@ -38,11 +38,13 @@ gettext.install('glance', unicode=1)
from glance.common import config
from glance.common import wsgi
from glance.openstack.common import log
if __name__ == '__main__':
try:
config.parse_args()
log.setup('glance')
app = config.load_paste_app()

5
glance/common/config.py
View File

@ -169,10 +169,7 @@ def load_paste_app(app_name=None):
conf_file = _get_deployment_config_file()
try:
# Setup logging early
setup_logging()
logger = logging.getLogger(app_name)
logger = logging.getLogger(__name__)
logger.debug(_("Loading %(app_name)s from %(conf_file)s"),
{'conf_file': conf_file, 'app_name': app_name})

8
glance/tests/functional/test_logging.py
View File

@ -44,13 +44,13 @@ class TestLogging(functional.FunctionalTest):
api_log_out = open(self.api_server.log_file, 'r').read()
self.assertTrue('DEBUG [glance-api]' in api_log_out)
self.assertTrue('DEBUG glance' in api_log_out)
self.assertTrue(os.path.exists(self.registry_server.log_file))
registry_log_out = open(self.registry_server.log_file, 'r').read()
self.assertTrue('DEBUG [glance-registry]' in registry_log_out)
self.assertTrue('DEBUG glance' in registry_log_out)
self.stop_servers()
@ -66,13 +66,13 @@ class TestLogging(functional.FunctionalTest):
api_log_out = open(self.api_server.log_file, 'r').read()
self.assertFalse('DEBUG [glance-api]' in api_log_out)
self.assertFalse('DEBUG glance' in api_log_out)
self.assertTrue(os.path.exists(self.registry_server.log_file))
registry_log_out = open(self.registry_server.log_file, 'r').read()
self.assertFalse('DEBUG [glance-registry]' in registry_log_out)
self.assertFalse('DEBUG glance' in registry_log_out)
self.stop_servers()