From: Russell Bryant <rbryant@redhat.com>
Date: Wed, 12 Sep 2012 16:34:43 +0000 (-0400)
Subject: Sync log format changes from openstack-common.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=08bfa1c5b9ed168f0edda03e63b2e445068c514c;p=openstack-build%2Fcinder-build.git

Sync log format changes from openstack-common.

This patch pulls in the following change from openstack-common:

    9f88d84 Improve logging of process id

Change-Id: I6c5be346ed332d14357441b2b147ad1f09157f41
---

diff --git a/cinder/openstack/common/log.py b/cinder/openstack/common/log.py
index c3520893c..935957a61 100644
--- a/cinder/openstack/common/log.py
+++ b/cinder/openstack/common/log.py
@@ -54,15 +54,14 @@ log_opts = [
                        '%(message)s',
                help='format string to use for log messages with context'),
     cfg.StrOpt('logging_default_format_string',
-               default='%(asctime)s %(levelname)s %(name)s [-] %(instance)s'
-                       '%(message)s',
+               default='%(asctime)s %(process)d %(levelname)s %(name)s [-]'
+                       ' %(instance)s%(message)s',
                help='format string to use for log messages without context'),
     cfg.StrOpt('logging_debug_format_suffix',
-               default='from (pid=%(process)d) %(funcName)s '
-                       '%(pathname)s:%(lineno)d',
+               default='%(funcName)s %(pathname)s:%(lineno)d',
                help='data to append to log format when level is DEBUG'),
     cfg.StrOpt('logging_exception_prefix',
-               default='%(asctime)s TRACE %(name)s %(instance)s',
+               default='%(asctime)s %(process)d TRACE %(name)s %(instance)s',
                help='prefix each line of exception output with this format'),
     cfg.ListOpt('default_log_levels',
                 default=[