From b87511973bde61cb55569dd2b9671c0ead1219c5 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: I0ac91a77a1809ee851821bd6f52a43cc6fda890b
Closes-Bug: #1943212
---
 manifests/logging.pp                                        | 6 ++++++
 .../notes/add_watch_log_file-option-add0360c545882f4.yaml   | 4 ++++
 spec/classes/ceilometer_logging_spec.rb                     | 3 +++
 3 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/add_watch_log_file-option-add0360c545882f4.yaml

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 6c93acfb..80809c0e 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -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 ceilometer::logging(
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/ceilometer',
   $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 ceilometer::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,
diff --git a/releasenotes/notes/add_watch_log_file-option-add0360c545882f4.yaml b/releasenotes/notes/add_watch_log_file-option-add0360c545882f4.yaml
new file mode 100644
index 00000000..357fe68c
--- /dev/null
+++ b/releasenotes/notes/add_watch_log_file-option-add0360c545882f4.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``ceilometer::logging::watch_log_file`` parameter has been added.
diff --git a/spec/classes/ceilometer_logging_spec.rb b/spec/classes/ceilometer_logging_spec.rb
index 3f0fcd2a..6ebc2a1c 100644
--- a/spec/classes/ceilometer_logging_spec.rb
+++ b/spec/classes/ceilometer_logging_spec.rb
@@ -30,6 +30,7 @@ describe 'ceilometer::logging' do
      :log_facility                   => 'LOG_FOO',
      :log_dir                        => '/var/log',
      :log_file                       => '/var/log/ceilometer/ceilometer.log',
+     :watch_log_file                 => true,
      :debug                          => true,
     }
   end
@@ -66,6 +67,7 @@ describe 'ceilometer::logging' do
         :syslog_log_facility => '<SERVICE DEFAULT>',
         :log_dir             => '/var/log/ceilometer',
         :log_file            => '<SERVICE DEFAULT>',
+        :watch_log_file      => '<SERVICE DEFAULT>',
         :debug               => '<SERVICE DEFAULT>',
       )
     end
@@ -81,6 +83,7 @@ describe 'ceilometer::logging' do
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',
         :log_file            => '/var/log/ceilometer/ceilometer.log',
+        :watch_log_file      => true,
         :debug               => true,
       )
     end