openstack
/
puppet-glare
Code Issues Proposed changes

Add use_journal option for logging configuration 

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

Change-Id: I9e660aa635866deb83bb0760452e0ecd397e2ef1
This commit is contained in:
ZhongShengping 2018-01-15 15:47:22 +08:00
parent 2c7d1ed2bb
commit b483ef992d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/logging.pp
View File

@ -16,6 +16,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
@ -100,6 +104,7 @@
class glare::logging(
$use_syslog = $::os_service_default,
$use_json = $::os_service_default,
$use_journal = $::os_service_default,
$use_stderr = $::os_service_default,
$syslog_log_facility = $::os_service_default,
$log_dir = '/var/log/glare',
@ -124,6 +129,7 @@ class glare::logging(
use_stderr => $use_stderr,
use_syslog => $use_syslog,
use_json => $use_json,
use_journal => $use_journal,
log_dir => $log_dir,
log_file => $log_file,
debug => $debug,

3
spec/classes/glare_logging_spec.rb
View File

@ -25,6 +25,7 @@ describe 'glare::logging' do
:log_date_format => '%Y-%m-%d %H:%M:%S',
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
@ -60,6 +61,7 @@ describe 'glare::logging' do
is_expected.to contain_oslo__log('glare_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/glare',
@ -74,6 +76,7 @@ describe 'glare::logging' do
is_expected.to contain_oslo__log('glare_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',