From aa73bc3f026cdfd85a209e513b006dae9d36c2f8 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Tue, 14 Sep 2021 16:02:08 +0800
Subject: [PATCH] Add watch_log_file option

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

Change-Id: I703cd1bccea8e14da5c228de02a341b0f6e9bc46
Closes-Bug: #1943212
---
 manifests/api/logging.pp                                   | 7 +++++++
 .../notes/add_watch_log_file-option-921e57c03a0b459e.yaml  | 4 ++++
 spec/classes/barbican_api_logging_spec.rb                  | 5 ++++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/add_watch_log_file-option-921e57c03a0b459e.yaml

diff --git a/manifests/api/logging.pp b/manifests/api/logging.pp
index 9b76bd65..5c7afa81 100644
--- a/manifests/api/logging.pp
+++ b/manifests/api/logging.pp
@@ -37,6 +37,11 @@
 #   (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
@@ -109,6 +114,7 @@ class barbican::api::logging(
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/barbican',
   $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,
@@ -133,6 +139,7 @@ class barbican::api::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-921e57c03a0b459e.yaml b/releasenotes/notes/add_watch_log_file-option-921e57c03a0b459e.yaml
new file mode 100644
index 00000000..e338b2ac
--- /dev/null
+++ b/releasenotes/notes/add_watch_log_file-option-921e57c03a0b459e.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``barbican::logging::watch_log_file`` parameter has been added.
diff --git a/spec/classes/barbican_api_logging_spec.rb b/spec/classes/barbican_api_logging_spec.rb
index 2464990a..83d44658 100644
--- a/spec/classes/barbican_api_logging_spec.rb
+++ b/spec/classes/barbican_api_logging_spec.rb
@@ -49,6 +49,7 @@ describe 'barbican::api::logging' do
      :log_facility                   => 'LOG_FOO',
      :log_dir                        => '/var/log',
      :log_file                       => '/var/tmp/barbican_random.log',
+     :watch_log_file                 => true,
      :debug                          => true,
     }
   end
@@ -85,6 +86,7 @@ describe 'barbican::api::logging' do
         :syslog_log_facility => '<SERVICE DEFAULT>',
         :log_dir             => '/var/log/barbican',
         :log_file            => '<SERVICE DEFAULT>',
+        :watch_log_file      => '<SERVICE DEFAULT>',
         :debug               => '<SERVICE DEFAULT>',
       )
     end
@@ -100,6 +102,7 @@ describe 'barbican::api::logging' do
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',
         :log_file            => '/var/tmp/barbican_random.log',
+        :watch_log_file      => true,
         :debug               => true,
       )
     end
@@ -133,7 +136,7 @@ describe 'barbican::api::logging' do
      :log_config_append, :publish_errors,
      :default_log_levels, :fatal_deprecations,
      :instance_format, :instance_uuid_format,
-     :log_date_format, :log_file ].each { |param|
+     :log_date_format, :log_file, :watch_log_file ].each { |param|
         it { is_expected.to contain_oslo__log('barbican_config').with("#{param}" => '<SERVICE DEFAULT>') }
     }
   end