Add use_journal option for logging configuration

This enables oslo.log to pass logging records to journald.

Change-Id: I51411d8fcea59d828f2d1c6c179d78c9ab516a0e
This commit is contained in:
ZhongShengping 2018-01-15 16:32:33 +08:00
parent 7c18d5ac7a
commit f687aa3909
3 changed files with 14 additions and 0 deletions

View File

@ -17,6 +17,10 @@
# (Optional) Use json for logging.
# Defaults to $::os_service_default
#
# [*use_journal*]
# (Optional) Use journal for logging.
# Defaults to $::os_service_default
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to $::os_service_default
@ -94,6 +98,7 @@
class vitrage::logging(
$use_syslog = $::os_service_default,
$use_json = $::os_service_default,
$use_journal = $::os_service_default,
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/vitrage',
@ -129,6 +134,7 @@ class vitrage::logging(
debug => $debug_real,
use_syslog => $use_syslog_real,
use_json => $use_json,
use_journal => $use_journal,
use_stderr => $use_stderr_real,
log_dir => $log_dir_real,
syslog_log_facility => $log_facility_real,

View File

@ -0,0 +1,5 @@
---
features:
- |
Adds the use_journal option for configuring oslo.log. This will enable
passing the logs to journald.

View File

@ -25,6 +25,7 @@ describe 'vitrage::logging' do
:log_date_format => '%Y-%m-%d %H:%M:%S',
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
@ -59,6 +60,7 @@ describe 'vitrage::logging' do
is_expected.to contain_oslo__log('vitrage_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/vitrage',
@ -72,6 +74,7 @@ describe 'vitrage::logging' do
is_expected.to contain_oslo__log('vitrage_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',