Browse code

add use_journal if we are enabling systemd

This is going to be a new option in oslo.log, which we can start
setting early to make it take effect.

Change-Id: If0e5e4717a1810c759058f33608fbac7543f2d85

Sean Dague authored on 2017/04/05 20:23:37
Showing 1 changed files
... ...
@@ -606,11 +606,13 @@ function setup_colorized_logging {
606 606
 function setup_systemd_logging {
607 607
     local conf_file=$1
608 608
     local conf_section="DEFAULT"
609
-    local project_var="project_name"
610
-    local user_var="user_name"
611
-    iniset $conf_file $conf_section logging_context_format_string "%(levelname)s %(name)s [%(request_id)s %("$project_var")s %("$user_var")s] %(instance)s%(message)s"
612
-    iniset $conf_file $conf_section logging_default_format_string "%(levelname)s %(name)s [-] %(instance)s%(color)s%(message)s"
613
-    iniset $conf_file $conf_section logging_debug_format_suffix "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"
609
+    iniset $conf_file $conf_section use_journal "True"
610
+    iniset $conf_file $conf_section logging_context_format_string \
611
+           "%(levelname)s %(name)s [%(request_id)s %(project_name)s %(user_name)s] %(instance)s%(message)s"
612
+    iniset $conf_file $conf_section logging_default_format_string \
613
+           "%(levelname)s %(name)s [-] %(instance)s%(color)s%(message)s"
614
+    iniset $conf_file $conf_section logging_debug_format_suffix \
615
+           "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"
614 616
     iniset $conf_file $conf_section logging_exception_prefix "ERROR %(name)s %(instance)s"
615 617
 }
616 618