From 939a58346ebffa780c99ca94b4b282a8f594d25a Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 15 Jan 2018 15:45:52 +0800 Subject: [PATCH] Add use_journal option for logging configuration This enables oslo.log to pass logging records to journald. Change-Id: I11ad2c8557fb2e6793c5ca368d21cf08833e2f32 --- manifests/api/logging.pp | 6 ++++++ manifests/registry/logging.pp | 6 ++++++ ...urnal-option-for-logging-9d1bab2bd5816127.yaml | 5 +++++ spec/classes/glance_api_logging_spec.rb | 15 +++++++++------ spec/classes/glance_registry_logging_spec.rb | 15 +++++++++------ 5 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 releasenotes/notes/add-use_journal-option-for-logging-9d1bab2bd5816127.yaml diff --git a/manifests/api/logging.pp b/manifests/api/logging.pp index 149da83c..dbef58d6 100644 --- a/manifests/api/logging.pp +++ b/manifests/api/logging.pp @@ -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, diff --git a/manifests/registry/logging.pp b/manifests/registry/logging.pp index 64378f9b..e1188005 100644 --- a/manifests/registry/logging.pp +++ b/manifests/registry/logging.pp @@ -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, diff --git a/releasenotes/notes/add-use_journal-option-for-logging-9d1bab2bd5816127.yaml b/releasenotes/notes/add-use_journal-option-for-logging-9d1bab2bd5816127.yaml new file mode 100644 index 00000000..12b190e7 --- /dev/null +++ b/releasenotes/notes/add-use_journal-option-for-logging-9d1bab2bd5816127.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Adds the use_journal option for configuring oslo.log. This will enable + passing the logs to journald. diff --git a/spec/classes/glance_api_logging_spec.rb b/spec/classes/glance_api_logging_spec.rb index b00e6cab..5a3b089b 100644 --- a/spec/classes/glance_api_logging_spec.rb +++ b/spec/classes/glance_api_logging_spec.rb @@ -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 => '', - :use_json => '', - :use_stderr => '', - :log_dir => '/var/log/glance', - :log_file => '/var/log/glance/api.log', - :debug => '', + :use_syslog => '', + :use_json => '', + :use_journal => '', + :use_stderr => '', + :log_dir => '/var/log/glance', + :log_file => '/var/log/glance/api.log', + :debug => '', ) 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', diff --git a/spec/classes/glance_registry_logging_spec.rb b/spec/classes/glance_registry_logging_spec.rb index 16860af5..e3d8d1d8 100644 --- a/spec/classes/glance_registry_logging_spec.rb +++ b/spec/classes/glance_registry_logging_spec.rb @@ -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 => '', - :use_json => '', - :use_stderr => '', - :log_dir => '/var/log/glance', - :log_file => '/var/log/glance/registry.log', - :debug => '', + :use_syslog => '', + :use_json => '', + :use_journal => '', + :use_stderr => '', + :log_dir => '/var/log/glance', + :log_file => '/var/log/glance/registry.log', + :debug => '', ) 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',