From b6753cea8cd0e07d982048d2f856c6168fc74a92 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 5 Apr 2016 11:52:44 -0400 Subject: [PATCH] simplify colorized logging setup This makes setup_colorized_logging be a thing which takes a single parameter and doesn't let projects do things differently. It also changes the order of values from user / project to project / user to represent the hierachy more clearly. Change-Id: I8c0ba7da54be588e3e068734feb4f78ed7c5a14a --- functions | 8 ++++---- lib/cinder | 2 +- lib/glance | 6 +++--- lib/keystone | 2 +- lib/neutron-legacy | 2 +- lib/nova | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/functions b/functions index 0be9794d9a..3e0e0d5559 100644 --- a/functions +++ b/functions @@ -578,11 +578,11 @@ function vercmp { # setup_colorized_logging something.conf SOMESECTION function setup_colorized_logging { local conf_file=$1 - local conf_section=$2 - local project_var=${3:-"project_name"} - local user_var=${4:-"user_name"} + local conf_section="DEFAULT" + local project_var="project_name" + local user_var="user_name" # Add color to logging output - iniset $conf_file $conf_section logging_context_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [%(request_id)s %("$user_var")s %("$project_var")s%(color)s] %(instance)s%(color)s%(message)s" + iniset $conf_file $conf_section logging_context_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [%(request_id)s %("$project_var")s %("$user_var")s%(color)s] %(instance)s%(color)s%(message)s" iniset $conf_file $conf_section logging_default_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s" iniset $conf_file $conf_section logging_debug_format_suffix "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d" iniset $conf_file $conf_section logging_exception_prefix "%(color)s%(asctime)s.%(msecs)03d TRACE %(name)s %(instance)s" diff --git a/lib/cinder b/lib/cinder index 40f0f16d6b..cf5bb25cfe 100644 --- a/lib/cinder +++ b/lib/cinder @@ -334,7 +334,7 @@ function configure_cinder { # Format logging if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$CINDER_USE_MOD_WSGI" == "False" ]; then - setup_colorized_logging $CINDER_CONF DEFAULT "project_id" "user_id" + setup_colorized_logging $CINDER_CONF else # Set req-id, project-name and resource in log format iniset $CINDER_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(levelname)s %(name)s [%(request_id)s %(project_name)s] %(resource)s%(message)s" diff --git a/lib/glance b/lib/glance index 4ba1d20bd7..17361143df 100644 --- a/lib/glance +++ b/lib/glance @@ -230,8 +230,8 @@ function configure_glance { # Format logging if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then - setup_colorized_logging $GLANCE_API_CONF DEFAULT tenant user - setup_colorized_logging $GLANCE_REGISTRY_CONF DEFAULT tenant user + setup_colorized_logging $GLANCE_API_CONF + setup_colorized_logging $GLANCE_REGISTRY_CONF fi cp -p $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI @@ -273,7 +273,7 @@ function configure_glance { if is_service_enabled g-glare; then local dburl dburl=`database_connection_url glance` - setup_colorized_logging $GLANCE_GLARE_CONF DEFAULT tenant user + setup_colorized_logging $GLANCE_GLARE_CONF iniset $GLANCE_GLARE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $GLANCE_GLARE_CONF DEFAULT bind_host $GLANCE_SERVICE_LISTEN_ADDRESS iniset $GLANCE_GLARE_CONF DEFAULT bind_port $GLANCE_GLARE_PORT diff --git a/lib/keystone b/lib/keystone index 34730b892a..474af8be1d 100644 --- a/lib/keystone +++ b/lib/keystone @@ -284,7 +284,7 @@ function configure_keystone { # Format logging if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$KEYSTONE_DEPLOY" != "mod_wsgi" ] ; then - setup_colorized_logging $KEYSTONE_CONF DEFAULT + setup_colorized_logging $KEYSTONE_CONF fi iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 29c187e1e1..cf59b2d6dd 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -733,7 +733,7 @@ function _configure_neutron_common { # Format logging if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then - setup_colorized_logging $NEUTRON_CONF DEFAULT project_id + setup_colorized_logging $NEUTRON_CONF else # Show user_name and project_name by default like in nova iniset $NEUTRON_CONF DEFAULT logging_user_identity_format "%(user_name)s %(project_name)s" diff --git a/lib/nova b/lib/nova index 450242b579..617cf5c3aa 100644 --- a/lib/nova +++ b/lib/nova @@ -520,7 +520,7 @@ function create_nova_conf { fi # Format logging if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$NOVA_USE_MOD_WSGI" == "False" ] ; then - setup_colorized_logging $NOVA_CONF DEFAULT + setup_colorized_logging $NOVA_CONF else # Show user_name and project_name instead of user_id and project_id iniset $NOVA_CONF DEFAULT logging_user_identity_format "%(user_name)s %(project_name)s"