Merge 643b0bd into f5851f4

voxpupuli · Jun 2, 2020 · 3e5c184 · 3e5c184
2 parents f5851f4 + 643b0bd
commit 3e5c184
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -190,6 +190,10 @@ The maximum number of threads used by Rundeck for concurrent jobs by default is
 
 The log4j logging level to be set for the Rundeck application.
 
+##### `rd_log4j_rotatedaily`
+
+Enable log4j daily logrotation. Log files are rotated daily and saved as xxx.log.yyyy-MM-dd.
+
 ##### `rdeck_profile_template` (**Requires Rundeck v2.8.x**)
 
 Allows you to use your own profile template instead of the default from the package maintainer

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -52,6 +52,7 @@
   $quartz_job_threadcount             = $rundeck::quartz_job_threadcount
   $rd_loglevel                        = $rundeck::rd_loglevel
   $rd_auditlevel                      = $rundeck::rd_auditlevel
+  $rd_log4j_rotatedaily               = $rundeck::rd_log4j_rotatedaily
   $rdeck_config_template              = $rundeck::rdeck_config_template
   $rdeck_home                         = $rundeck::rdeck_home
   $manage_home                        = $rundeck::manage_home

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -122,6 +122,9 @@
 #
 # [*rd_loglevel*]
 #  The log4j logging level to be set for the Rundeck application.
+# 
+# [*rd_log4j_rotatedaily*]
+#  Enable log4j daily logrotation. Log files are rotated daily and saved as xxx.log.yyyy-MM-dd. 
 #
 # [*rd_auditlevel*]
 #  The log4j logging level to be set for the Rundeck application.
@@ -257,6 +260,7 @@
   Integer $quartz_job_threadcount                               = $rundeck::params::quartz_job_threadcount,
   Rundeck::Loglevel $rd_loglevel                                = $rundeck::params::loglevel,
   Rundeck::Loglevel $rd_auditlevel                              = $rundeck::params::loglevel,
+  Boolean $rd_log4j_rotatedaily                                 = true,
   String $rdeck_config_template                                 = $rundeck::params::rdeck_config_template,
   Stdlib::Absolutepath $rdeck_home                              = $rundeck::params::rdeck_home,
   Boolean $manage_home                                          = $rundeck::params::manage_home,

diff --git a/templates/log4j.properties.erb b/templates/log4j.properties.erb
@@ -83,9 +83,11 @@ log4j.appender.stdout.layout.ConversionPattern=%-5p %c{1}: %m%n
 #
 # Output of the RunDeck command line utilities
 #
-log4j.appender.cmd-logger=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.cmd-logger.file=<%= @service_logs_dir %>/command.log
+log4j.appender.cmd-logger=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
+<% if @rd_log4j_rotatedaily -%>
 log4j.appender.cmd-logger.datePattern='.'yyyy-MM-dd
+<% end -%>
+log4j.appender.cmd-logger.file=<%= @service_logs_dir %>/command.log
 log4j.appender.cmd-logger.append=true
 log4j.appender.cmd-logger.layout=org.apache.log4j.PatternLayout
 log4j.appender.cmd-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
@@ -95,9 +97,12 @@ log4j.appender.cmd-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m
 #
 # Captures all output from the rundeckd server.
 #
-log4j.appender.server-logger=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.server-logger.file=<%= @service_logs_dir %>/rundeck.log
+
+log4j.appender.server-logger=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
+<% if @rd_log4j_rotatedaily -%>
 log4j.appender.server-logger.datePattern='.'yyyy-MM-dd
+<% end -%>
+log4j.appender.server-logger.file=<%= @service_logs_dir %>/rundeck.log
 log4j.appender.server-logger.append=true
 log4j.appender.server-logger.layout=org.apache.log4j.PatternLayout
 log4j.appender.server-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
@@ -107,7 +112,7 @@ log4j.appender.server-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c -
 #
 # Captures all audit events.
 #
-log4j.appender.audit=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.audit=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
 log4j.appender.audit.file=<%= @service_logs_dir %>/rundeck.audit.log
 log4j.appender.audit.append=true
 log4j.appender.audit.layout=org.apache.log4j.PatternLayout
@@ -118,7 +123,7 @@ log4j.appender.audit.layout.ConversionPattern=%d{ISO8601} - %m%n
 #
 # Logs remote HTTP requests for Options JSON data
 #
-log4j.appender.options=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.options=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
 log4j.appender.options.file=<%= @service_logs_dir %>/rundeck.options.log
 log4j.appender.options.append=true
 log4j.appender.options.layout=org.apache.log4j.PatternLayout
@@ -129,7 +134,7 @@ log4j.appender.options.layout.ConversionPattern=[%d{ISO8601}] %X{httpStatusCode}
 #
 # Logs all Job definition changes
 #
-log4j.appender.jobchanges=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.jobchanges=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
 log4j.appender.jobchanges.file=<%= @service_logs_dir %>/rundeck.jobs.log
 log4j.appender.jobchanges.append=true
 log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
@@ -140,7 +145,7 @@ log4j.appender.jobchanges.layout.ConversionPattern=[%d{ISO8601}] %X{user} %X{cha
 #
 # Logs all API requests
 #
-log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.apirequests=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
 log4j.appender.apirequests.file=<%= @service_logs_dir %>/rundeck.api.log
 log4j.appender.apirequests.append=true
 log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
@@ -151,7 +156,7 @@ log4j.appender.apirequests.layout.ConversionPattern=[%d{ISO8601}] %X{remoteHost}
 #
 # Logs all Web requests
 #
-log4j.appender.access=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.access=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
 log4j.appender.access.file=<%= @service_logs_dir %>/rundeck.access.log
 log4j.appender.access.append=true
 log4j.appender.access.layout=org.apache.log4j.PatternLayout