reenabled logging

voxpupuli · Jun 2, 2020 · 643b0bd · 643b0bd
1 parent 290ac5d
commit 643b0bd
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/templates/log4j.properties.erb b/templates/log4j.properties.erb
@@ -83,8 +83,8 @@ log4j.appender.stdout.layout.ConversionPattern=%-5p %c{1}: %m%n
 #
 # Output of the RunDeck command line utilities
 #
+log4j.appender.cmd-logger=org.apache.log4j.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
 <% if @rd_log4j_rotatedaily -%>
-log4j.appender.cmd-logger=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.cmd-logger.datePattern='.'yyyy-MM-dd
 <% end -%>
 log4j.appender.cmd-logger.file=<%= @service_logs_dir %>/command.log
@@ -98,8 +98,8 @@ 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.<% if @rd_log4j_rotatedaily %>DailyRolling<% end %>FileAppender
 <% if @rd_log4j_rotatedaily -%>
-log4j.appender.server-logger=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.server-logger.datePattern='.'yyyy-MM-dd
 <% end -%>
 log4j.appender.server-logger.file=<%= @service_logs_dir %>/rundeck.log
@@ -112,9 +112,7 @@ log4j.appender.server-logger.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c -
 #
 # Captures all audit events.
 #
-<% if @rd_log4j_rotatedaily -%>
-log4j.appender.audit=org.apache.log4j.DailyRollingFileAppender
-<% end -%>
+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
@@ -125,9 +123,7 @@ log4j.appender.audit.layout.ConversionPattern=%d{ISO8601} - %m%n
 #
 # Logs remote HTTP requests for Options JSON data
 #
-<% if @rd_log4j_rotatedaily -%>
-log4j.appender.options=org.apache.log4j.DailyRollingFileAppender
-<% end -%>
+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
@@ -138,9 +134,7 @@ log4j.appender.options.layout.ConversionPattern=[%d{ISO8601}] %X{httpStatusCode}
 #
 # Logs all Job definition changes
 #
-<% if @rd_log4j_rotatedaily -%>
-log4j.appender.jobchanges=org.apache.log4j.DailyRollingFileAppender
-<% end -%>
+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
@@ -151,9 +145,7 @@ log4j.appender.jobchanges.layout.ConversionPattern=[%d{ISO8601}] %X{user} %X{cha
 #
 # Logs all API requests
 #
-<% if @rd_log4j_rotatedaily -%>
-log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
-<% end -%>
+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
@@ -164,9 +156,7 @@ log4j.appender.apirequests.layout.ConversionPattern=[%d{ISO8601}] %X{remoteHost}
 #
 # Logs all Web requests
 #
-<% if @rd_log4j_rotatedaily -%>
-log4j.appender.access=org.apache.log4j.DailyRollingFileAppender
-<% end -%>
+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