diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-17 13:13:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-17 13:13:06 +0000 |
| commit | ca5201010b2dd61ea58b2d3c2d9205e4dcaacfb2 (patch) | |
| tree | 70d969e961c257770835320b3fbfc6fe9cb10b18 /devstack | |
| parent | 5afe39986a8f52c272d571f67a04f472171efb68 (diff) | |
| parent | 4a023ac9cc4bef76418bcbc7dc2c16bf2db0e458 (diff) | |
| download | designate-ca5201010b2dd61ea58b2d3c2d9205e4dcaacfb2.tar.gz | |
Merge "os-loganayze fix"
Diffstat (limited to 'devstack')
| -rwxr-xr-x | devstack/plugin.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index c9d43491..9fc0eae0 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -20,10 +20,6 @@ function setup_colorized_logging_designate { local user_var=${4:-"user_name"} setup_colorized_logging $conf_file $conf_section $project_var $user_var - - # Override the logging_context_format_string value chosen by - # setup_colorized_logging. - iniset $conf_file $conf_section logging_context_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [[01;36m%(request_id)s [00;36m%(user_identity)s%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m" } # DevStack Plugin @@ -134,12 +130,12 @@ function configure_designate { fi # Logging Configuration - if [ "$SYSLOG" != "False" ]; then - iniset $DESIGNATE_CONF DEFAULT use_syslog True + if [ "$USE_SYSTEMD" != "False" ]; then + setup_systemd_logging $DESIGNATE_CONF fi # Format logging - if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then + if [ "$LOG_COLOR" == "True" ] && [ "$USE_SYSTEMD" == "False" ]; then setup_colorized_logging_designate $DESIGNATE_CONF DEFAULT "tenant" "user" fi |