Add use_journal option for logging configuration

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

Change-Id: I11ad2c8557fb2e6793c5ca368d21cf08833e2f32
This commit is contained in:
ZhongShengping 2018-01-15 15:45:52 +08:00
parent 3bc17a62f9
commit 939a58346e
5 changed files with 35 additions and 12 deletions

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.
@ -97,6 +101,7 @@
class glance::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/glance',
@ -139,6 +144,7 @@ class glance::api::logging(
use_stderr => $use_stderr_real,
use_syslog => $use_syslog_real,
use_json => $use_json,
use_journal => $use_journal,
log_dir => $log_dir_real,
log_file => $log_file_real,
syslog_log_facility => $log_facility_real,

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.
@ -97,6 +101,7 @@
class glance::registry::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/glance',
@ -135,6 +140,7 @@ class glance::registry::logging(
use_stderr => $use_stderr_real,
use_syslog => $use_syslog_real,
use_json => $use_json,
use_journal => $use_journal,
log_dir => $log_dir_real,
log_file => $log_file_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 'glance::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',
@ -58,12 +59,13 @@ describe 'glance::api::logging' do
shared_examples 'basic default logging settings' do
it 'configures glance logging settings with default values' do
is_expected.to contain_oslo__log('glance_api_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/glance',
:log_file => '/var/log/glance/api.log',
:debug => '<SERVICE DEFAULT>',
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/glance',
:log_file => '/var/log/glance/api.log',
:debug => '<SERVICE DEFAULT>',
)
end
end
@ -73,6 +75,7 @@ describe 'glance::api::logging' do
is_expected.to contain_oslo__log('glance_api_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',

View File

@ -25,6 +25,7 @@ describe 'glance::registry::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',
@ -58,12 +59,13 @@ describe 'glance::registry::logging' do
shared_examples 'basic default logging settings' do
it 'configures glance logging settings with default values' do
is_expected.to contain_oslo__log('glance_registry_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/glance',
:log_file => '/var/log/glance/registry.log',
:debug => '<SERVICE DEFAULT>',
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/glance',
:log_file => '/var/log/glance/registry.log',
:debug => '<SERVICE DEFAULT>',
)
end
end
@ -73,6 +75,7 @@ describe 'glance::registry::logging' do
is_expected.to contain_oslo__log('glance_registry_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',