openstack/puppet-heat
Code Issues Proposed changes

Add watch_log_file option

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

Change-Id: I2feecb96c4b859584ead37155269cb33d742e9d2
Closes-Bug: #1943212
This commit is contained in:
ZhongShengping 2021-09-14 16:02:09 +08:00
parent d4564ce00b
commit a1ae65f323
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 heat::logging(
$log_facility = $::os_service_default, $log_facility = $::os_service_default,
$log_dir = '/var/log/heat', $log_dir = '/var/log/heat',
$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,
@ -127,6 +132,7 @@ class heat::logging(
log_date_format => $log_date_format, log_date_format => $log_date_format,
log_dir => $log_dir, log_dir => $log_dir,
log_file => $log_file, log_file => $log_file,
watch_log_file => $watch_log_file,
use_syslog => $use_syslog, use_syslog => $use_syslog,
use_json => $use_json, use_json => $use_json,
use_journal => $use_journal, use_journal => $use_journal,

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

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

17
spec/classes/heat_logging_spec.rb
View File

@ -30,6 +30,7 @@ describe 'heat::logging' do
:log_facility => 'LOG_FOO', :log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
:log_file => '/var/log/heat/heat.log', :log_file => '/var/log/heat/heat.log',
:watch_log_file => true,
:debug => true, :debug => true,
} }
end end
@ -59,13 +60,14 @@ describe 'heat::logging' do
shared_examples 'basic default logging settings' do shared_examples 'basic default logging settings' do
it 'configures heat logging settings with default values' do it 'configures heat logging settings with default values' do
is_expected.to contain_oslo__log('heat_config').with( is_expected.to contain_oslo__log('heat_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/heat', :log_dir => '/var/log/heat',
:log_file => '<SERVICE DEFAULT>', :log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>', :watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
) )
end end
end end
@ -80,6 +82,7 @@ describe 'heat::logging' do
:syslog_log_facility => 'LOG_FOO', :syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
:log_file => '/var/log/heat/heat.log', :log_file => '/var/log/heat/heat.log',
:watch_log_file => true,
:debug => true, :debug => true,
) )
end end