Browse code

Merge "Add global_request_id to systemd logs"

Jenkins authored on 2017/05/31 21:29:52
Showing 1 changed files
... ...
@@ -625,7 +625,7 @@ function setup_systemd_logging {
625 625
     fi
626 626
     iniset $conf_file $conf_section logging_debug_format_suffix "{{${pidstr}%(funcName)s %(pathname)s:%(lineno)d}}"
627 627
 
628
-    iniset $conf_file $conf_section logging_context_format_string "%(color)s%(levelname)s %(name)s [%(request_id)s %(project_name)s %(user_name)s%(color)s] %(instance)s%(color)s%(message)s"
628
+    iniset $conf_file $conf_section logging_context_format_string "%(color)s%(levelname)s %(name)s [%(global_request_id)s %(request_id)s %(project_name)s %(user_name)s%(color)s] %(instance)s%(color)s%(message)s"
629 629
     iniset $conf_file $conf_section logging_default_format_string "%(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"
630 630
     iniset $conf_file $conf_section logging_exception_prefix "ERROR %(name)s %(instance)s"
631 631
 }