openstack/puppet-manila
Code Issues Proposed changes

Add watch_log_file option

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

Change-Id: I62a51e820d00220a3960c52d9be1cd22dc777a6b
Closes-Bug: #1943212
This commit is contained in:
ZhongShengping 2021-09-14 16:02:09 +08:00
parent 04067e051d
commit 7044fbbfa1
3 changed files with 13 additions and 0 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 manila::logging(
$log_facility = $::os_service_default, $log_facility = $::os_service_default,
$log_dir = '/var/log/manila', $log_dir = '/var/log/manila',
$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 manila::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-9aeec2b721b3c9f6.yaml Normal file
View File

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

3
spec/classes/manila_logging_spec.rb
View File

@ -30,6 +30,7 @@ describe 'manila::logging' do
:log_facility => 'LOG_FOO', :log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
:log_file => '/var/log/manila/manila.log', :log_file => '/var/log/manila/manila.log',
:watch_log_file => true,
:debug => true, :debug => true,
} }
end end
@ -66,6 +67,7 @@ describe 'manila::logging' do
:syslog_log_facility => '<SERVICE DEFAULT>', :syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/manila', :log_dir => '/var/log/manila',
:log_file => '<SERVICE DEFAULT>', :log_file => '<SERVICE DEFAULT>',
:watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>', :debug => '<SERVICE DEFAULT>',
) )
end end
@ -81,6 +83,7 @@ describe 'manila::logging' do
:syslog_log_facility => 'LOG_FOO', :syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
:log_file => '/var/log/manila/manila.log', :log_file => '/var/log/manila/manila.log',
:watch_log_file => true,
:debug => true, :debug => true,
) )
end end