openstack/puppet-ironic
Code Issues Proposed changes

Add watch_log_file option

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

Change-Id: Ifc04c0975a537831bc45ba7eaba27ccebf2a7b77
Closes-Bug: #1943212
This commit is contained in:
ZhongShengping 2021-09-14 16:02:09 +08:00
parent 84504f3103
commit 8129e85eac
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/inspector/logging.pp
View File

@ -33,6 +33,10 @@
# (Optional) File where logs should be stored.
# 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*]
# (optional) Format string to use for log messages with context.
# Defaults to $::os_service_default
@ -100,6 +104,7 @@ class ironic::inspector::logging(
$log_facility = $::os_service_default,
$log_dir = '/var/log/ironic-inspector',
$log_file = $::os_service_default,
$watch_log_file = $::os_service_default,
$debug = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
@ -123,6 +128,7 @@ class ironic::inspector::logging(
use_json => $use_json,
log_dir => $log_dir,
log_file => $log_file,
watch_log_file => $watch_log_file,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,

6
manifests/logging.pp
View File

@ -37,6 +37,10 @@
# (Optional) File where logs should be stored.
# 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*]
# (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default
@ -105,6 +109,7 @@ class ironic::logging(
$log_facility = $::os_service_default,
$log_dir = '/var/log/ironic',
$log_file = $::os_service_default,
$watch_log_file = $::os_service_default,
$debug = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
@ -129,6 +134,7 @@ class ironic::logging(
use_journal => $use_journal,
log_dir => $log_dir,
log_file => $log_file,
watch_log_file => $watch_log_file,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,

5
releasenotes/notes/add_watch_log_file-option-9a19756c0781ffb5.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``ironic::logging::watch_log_file`` parameter has been added.
The new ``ironic::inspector::logging::watch_log_file`` parameter has been added.

3
spec/classes/ironic_inspector_logging_spec.rb
View File

@ -29,6 +29,7 @@ describe 'ironic::inspector::logging' do
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic-inspector.log',
:watch_log_file => true,
:debug => true,
}
end
@ -64,6 +65,7 @@ describe 'ironic::inspector::logging' do
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ironic-inspector',
:log_file => '<SERVICE DEFAULT>',
:watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)
end
@ -78,6 +80,7 @@ describe 'ironic::inspector::logging' do
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic-inspector.log',
:watch_log_file => true,
:debug => true,
)
end

3
spec/classes/ironic_logging_spec.rb
View File

@ -30,6 +30,7 @@ describe 'ironic::logging' do
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic.log',
:watch_log_file => true,
:debug => true,
}
end
@ -78,6 +79,7 @@ describe 'ironic::logging' do
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ironic',
:log_file => '<SERVICE DEFAULT>',
:watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)
end
@ -93,6 +95,7 @@ describe 'ironic::logging' do
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic.log',
:watch_log_file => true,
:debug => true,
)
end