From 312338f9c9390e412d40f580dc7da25972b60060 Mon Sep 17 00:00:00 2001
From: Shi Yan <shi.yan@unimelb.edu.au>
Date: Wed, 6 Mar 2019 11:48:26 +1100
Subject: [PATCH] Add log_file parameter

Change-Id: I1571576dc4c1958c5d1ed9cd7cc594d8a0daa005
---
 manifests/logging.pp                                        | 6 ++++++
 .../notes/add-log_file-for-logging-98ab323c1e1528b8.yaml    | 4 ++++
 spec/classes/sahara_logging_spec.rb                         | 3 +++
 3 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/add-log_file-for-logging-98ab323c1e1528b8.yaml

diff --git a/manifests/logging.pp b/manifests/logging.pp
index db6f22b0..6d5d7053 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -28,6 +28,10 @@
 #   Syslog facility to receive log lines.
 #   (Optional) Defaults to $::os_service_default.
 #
+# [*log_file*]
+#   (optional) Where to log
+#   Defaults to $::os_service_default
+#
 # [*log_dir*]
 #   (Optional) Directory where logs should be stored.
 #   If set to $::os_service_default, it will not log to any directory.
@@ -100,6 +104,7 @@ class sahara::logging(
   $use_journal                   = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
+  $log_file                      = $::os_service_default,
   $log_dir                       = '/var/log/sahara',
   $logging_context_format_string = $::os_service_default,
   $logging_default_format_string = $::os_service_default,
@@ -122,6 +127,7 @@ class sahara::logging(
     use_json                      => $use_json,
     use_journal                   => $use_journal,
     use_stderr                    => $use_stderr,
+    log_file                      => $log_file,
     log_dir                       => $log_dir,
     syslog_log_facility           => $log_facility,
     logging_context_format_string => $logging_context_format_string,
diff --git a/releasenotes/notes/add-log_file-for-logging-98ab323c1e1528b8.yaml b/releasenotes/notes/add-log_file-for-logging-98ab323c1e1528b8.yaml
new file mode 100644
index 00000000..e40d4c81
--- /dev/null
+++ b/releasenotes/notes/add-log_file-for-logging-98ab323c1e1528b8.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add the log_file option for logging.
diff --git a/spec/classes/sahara_logging_spec.rb b/spec/classes/sahara_logging_spec.rb
index 0bcaf81a..63c7babb 100644
--- a/spec/classes/sahara_logging_spec.rb
+++ b/spec/classes/sahara_logging_spec.rb
@@ -15,6 +15,7 @@ describe 'sahara::logging' do
       :use_journal                   => 'true',
       :use_stderr                    => 'false',
       :log_facility                  => 'LOG_LOCAL0',
+      :log_file                      => 'sahara.log',
       :log_dir                       => '/tmp/sahara',
       :logging_context_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s',
       :logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s',
@@ -67,6 +68,7 @@ describe 'sahara::logging' do
         :use_json    => '<SERVICE DEFAULT>',
         :use_journal => '<SERVICE DEFAULT>',
         :use_stderr  => '<SERVICE DEFAULT>',
+        :log_file    => '<SERVICE DEFAULT>',
         :log_dir     => '/var/log/sahara',
         :debug       => '<SERVICE DEFAULT>',
       )}
@@ -92,6 +94,7 @@ describe 'sahara::logging' do
         :use_journal         => true,
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_LOCAL0',
+        :log_file            => 'sahara.log',
         :log_dir             => '/tmp/sahara',
         :debug               => true,
       )}