From e51985e717f3ca24050a0d20217d50040760b3a5 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Mon, 10 Dec 2018 03:03:05 +0000
Subject: [PATCH] unify logging setup on zun

This leverages the devstack's setup_logging function which builds
consistent logging format.

Devstack's patch: https://review.openstack.org/#/c/301802/

Change-Id: I2462abe2d315495e008231d8b0721af315a48f5d
---
 devstack/lib/zun | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/devstack/lib/zun b/devstack/lib/zun
index dcfa1f4bd..aa02b0799 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -238,12 +238,7 @@ function create_zun_conf {
     fi
 
     # Format logging
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
-        setup_colorized_logging $ZUN_CONF DEFAULT
-    else
-        # Show user_name and project_name instead of user_id and project_id
-        iniset $ZUN_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
-    fi
+    setup_logging $ZUN_CONF
 
     # Register SSL certificates if provided
     if is_ssl_enabled_service zun; then