From b86fe3e33eb9ed455757319aa992b4068191eecc Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 14 Sep 2021 16:02:09 +0800 Subject: [PATCH] Add watch_log_file option Add support for Using logging handler designed to watch file system. Change-Id: Iecc618707d243f9e56acf085c71bb03737bde70c Closes-Bug: #1943212 --- manifests/logging.pp | 6 ++++++ .../notes/add_watch_log_file-option-ba1a0d5eaa8182f6.yaml | 4 ++++ spec/classes/octavia_logging_spec.rb | 3 +++ 3 files changed, 13 insertions(+) create mode 100644 releasenotes/notes/add_watch_log_file-option-ba1a0d5eaa8182f6.yaml diff --git a/manifests/logging.pp b/manifests/logging.pp index 86ac3eee..bdace551 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -37,6 +37,10 @@ # (Optional) File where logs should be stored. # Defaults to '/var/log/octavia/octavia.log' # +# [*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 @@ -109,6 +113,7 @@ class octavia::logging( $log_facility = $::os_service_default, $log_dir = '/var/log/octavia', $log_file = '/var/log/octavia/octavia.log', + $watch_log_file = $::os_service_default, $debug = $::os_service_default, $logging_context_format_string = $::os_service_default, $logging_default_format_string = $::os_service_default, @@ -133,6 +138,7 @@ class octavia::logging( use_stderr => $use_stderr, 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, diff --git a/releasenotes/notes/add_watch_log_file-option-ba1a0d5eaa8182f6.yaml b/releasenotes/notes/add_watch_log_file-option-ba1a0d5eaa8182f6.yaml new file mode 100644 index 00000000..ef9c7fc3 --- /dev/null +++ b/releasenotes/notes/add_watch_log_file-option-ba1a0d5eaa8182f6.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``octavia::logging::watch_log_file`` parameter has been added. diff --git a/spec/classes/octavia_logging_spec.rb b/spec/classes/octavia_logging_spec.rb index e95a0b73..fb399bc6 100644 --- a/spec/classes/octavia_logging_spec.rb +++ b/spec/classes/octavia_logging_spec.rb @@ -30,6 +30,7 @@ describe 'octavia::logging' do :log_facility => 'LOG_FOO', :log_dir => '/var/log', :log_file => '/var/tmp/octavia_random.log', + :watch_log_file => true, :debug => true, } end @@ -66,6 +67,7 @@ describe 'octavia::logging' do :syslog_log_facility => '', :log_dir => '/var/log/octavia', :log_file => '/var/log/octavia/octavia.log', + :watch_log_file => '', :debug => '', ) end @@ -81,6 +83,7 @@ describe 'octavia::logging' do :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log', :log_file => '/var/tmp/octavia_random.log', + :watch_log_file => true, :debug => true, ) end