openstack/puppet-barbican
Code Issues Proposed changes

Add use_journal option for logging configuration

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

Change-Id: I6a113466e110a92addb9b217b57a59be13f7aed9
This commit is contained in:
ZhongShengping 2018-01-15 15:25:34 +08:00
parent 035c0bb808
commit 16f5fa7242
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api/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 barbican::api::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/barbican',
@ -124,6 +129,7 @@ class barbican::api::logging(
debug => $debug,
use_syslog => $use_syslog,
use_json => $use_json,
use_journal => $use_journal,
use_stderr => $use_stderr,
log_dir => $log_dir,
log_file => $log_file,

5
releasenotes/notes/add-use_journal-option-for-logging-8dfac5372d73397c.yaml Normal file
View File

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

3
spec/classes/barbican_api_logging_spec.rb
View File

@ -44,6 +44,7 @@ describe 'barbican::api::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',
@ -79,6 +80,7 @@ describe 'barbican::api::logging' do
is_expected.to contain_oslo__log('barbican_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/barbican',
@ -93,6 +95,7 @@ describe 'barbican::api::logging' do
is_expected.to contain_oslo__log('barbican_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',