openstack/puppet-cinder
Code Issues Proposed changes

Add watch_log_file option

Browse Source 
Add support for Using logging handler designed to watch file system.

Change-Id: I86fe2ea8facfe5363ffb343978c3db20620599e1
Closes-Bug: #1943212
This commit is contained in:
ZhongShengping 2021-09-14 16:02:08 +08:00
parent 58bdb35873
commit d20eb43ec8
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/logging.pp
View File

@ -37,6 +37,10 @@
# (Optional) File where logs should be stored. # (Optional) File where logs should be stored.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $::os_service_default
#
# [*logging_context_format_string*] # [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context. # (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -105,6 +109,7 @@ class cinder::logging(
$log_facility = $::os_service_default, $log_facility = $::os_service_default,
$log_dir = '/var/log/cinder', $log_dir = '/var/log/cinder',
$log_file = $::os_service_default, $log_file = $::os_service_default,
$watch_log_file = $::os_service_default,
$debug = $::os_service_default, $debug = $::os_service_default,
$logging_context_format_string = $::os_service_default, $logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default, $logging_default_format_string = $::os_service_default,
@ -129,6 +134,7 @@ class cinder::logging(
use_stderr => $use_stderr, use_stderr => $use_stderr,
log_dir => $log_dir, log_dir => $log_dir,
log_file => $log_file, log_file => $log_file,
watch_log_file => $watch_log_file,
syslog_log_facility => $log_facility, syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string, logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string, logging_default_format_string => $logging_default_format_string,

4
releasenotes/notes/add_watch_log_file-option-b74553a438d125bc.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``cinder::logging::watch_log_file`` parameter has been added.

17
spec/classes/cinder_logging_spec.rb
View File

@ -29,6 +29,7 @@ describe 'cinder::logging' do
:log_facility => 'LOG_FOO', :log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
:log_file => '/var/log/cinder/cinder.log', :log_file => '/var/log/cinder/cinder.log',
:watch_log_file => true,
:debug => true, :debug => true,
} }
end end
@ -58,13 +59,14 @@ describe 'cinder::logging' do
shared_examples 'basic default logging settings' do shared_examples 'basic default logging settings' do
it 'configures cinder logging settings with default values' do it 'configures cinder logging settings with default values' do
is_expected.to contain_oslo__log('cinder_config').with( is_expected.to contain_oslo__log('cinder_config').with(
:use_syslog => '<SERVICE DEFAULT>', :use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>', :use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>', :use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>', :use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/cinder', :log_dir => '/var/log/cinder',
:log_file => '<SERVICE DEFAULT>', :log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>', :watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
) )
end end
end end
@ -79,6 +81,7 @@ describe 'cinder::logging' do
:syslog_log_facility => 'LOG_FOO', :syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
:log_file => '/var/log/cinder/cinder.log', :log_file => '/var/log/cinder/cinder.log',
:watch_log_file => true,
:debug => true, :debug => true,
) )
end end