use file.separator in log4j templates

rundeck · Aug 24, 2016 · 5a6b87c · 5a6b87c
1 parent 2681c1d
commit 5a6b87c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.../src/main/resources/com/dtolabs/launcher/setup/templates/server-log4j.properties.template b/.../src/main/resources/com/dtolabs/launcher/setup/templates/server-log4j.properties.template
@@ -90,7 +90,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.file=${rundeck.log.dir}/rundeck.options.log
+log4j.appender.options.file=${rundeck.log.dir}${file.separator}rundeck.options.log
 log4j.appender.options.append=true
 log4j.appender.options.layout=org.apache.log4j.PatternLayout
 log4j.appender.options.layout.ConversionPattern=${logger.options.format}
@@ -101,7 +101,7 @@ log4j.appender.options.layout.ConversionPattern=${logger.options.format}
 # Logs events for Rundeck storage layer
 #
 log4j.appender.storage=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.storage.file=${rundeck.log.dir}/rundeck.storage.log
+log4j.appender.storage.file=${rundeck.log.dir}${file.separator}rundeck.storage.log
 log4j.appender.storage.append=true
 log4j.appender.storage.layout=org.apache.log4j.PatternLayout
 log4j.appender.storage.layout.ConversionPattern=${logger.storage.format}
@@ -112,7 +112,7 @@ log4j.appender.storage.layout.ConversionPattern=${logger.storage.format}
 # Logs all Job definition changes
 #
 log4j.appender.jobchanges=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.jobchanges.file=${rundeck.log.dir}/rundeck.jobs.log
+log4j.appender.jobchanges.file=${rundeck.log.dir}${file.separator}rundeck.jobs.log
 log4j.appender.jobchanges.append=true
 log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
 log4j.appender.jobchanges.layout.ConversionPattern=${logger.jobchanges.format}
@@ -123,7 +123,7 @@ log4j.appender.jobchanges.layout.ConversionPattern=${logger.jobchanges.format}
 # Logs all execution events (start,finish,delete)
 #
 log4j.appender.execevents=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.execevents.file=${rundeck.log.dir}/rundeck.executions.log
+log4j.appender.execevents.file=${rundeck.log.dir}${file.separator}rundeck.executions.log
 log4j.appender.execevents.append=true
 log4j.appender.execevents.layout=org.apache.log4j.PatternLayout
 log4j.appender.execevents.layout.ConversionPattern=${logger.execevents.format}
@@ -134,7 +134,7 @@ log4j.appender.execevents.layout.ConversionPattern=${logger.execevents.format}
 # Logs all API requests
 #
 log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.apirequests.file=${rundeck.log.dir}/rundeck.api.log
+log4j.appender.apirequests.file=${rundeck.log.dir}${file.separator}rundeck.api.log
 log4j.appender.apirequests.append=true
 log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
 log4j.appender.apirequests.layout.ConversionPattern=${logger.apirequests.format}
@@ -145,7 +145,7 @@ log4j.appender.apirequests.layout.ConversionPattern=${logger.apirequests.format}
 # Logs all Web requests
 #
 log4j.appender.access=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.access.file=${rundeck.log.dir}/rundeck.access.log
+log4j.appender.access.file=${rundeck.log.dir}${file.separator}rundeck.access.log
 log4j.appender.access.append=true
 log4j.appender.access.layout=org.apache.log4j.PatternLayout
 log4j.appender.access.layout.ConversionPattern=${logger.access.format}

diff --git a/...auncher/src/main/resources/templates/exp/webapp/WEB-INF/classes/log4j.properties.template b/...auncher/src/main/resources/templates/exp/webapp/WEB-INF/classes/log4j.properties.template
@@ -94,7 +94,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.file=${rundeck.log.dir}/rundeck.options.log
+log4j.appender.options.file=${rundeck.log.dir}${file.separator}rundeck.options.log
 log4j.appender.options.append=true
 log4j.appender.options.layout=org.apache.log4j.PatternLayout
 log4j.appender.options.layout.ConversionPattern=${logger.options.format}
@@ -105,7 +105,7 @@ log4j.appender.options.layout.ConversionPattern=${logger.options.format}
 # Logs events for Rundeck storage layer
 #
 log4j.appender.storage=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.storage.file=${rundeck.log.dir}/rundeck.storage.log
+log4j.appender.storage.file=${rundeck.log.dir}${file.separator}rundeck.storage.log
 log4j.appender.storage.append=true
 log4j.appender.storage.layout=org.apache.log4j.PatternLayout
 log4j.appender.storage.layout.ConversionPattern=${logger.storage.format}
@@ -116,7 +116,7 @@ log4j.appender.storage.layout.ConversionPattern=${logger.storage.format}
 # Logs all Job definition changes
 #
 log4j.appender.jobchanges=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.jobchanges.file=${rundeck.log.dir}/rundeck.jobs.log
+log4j.appender.jobchanges.file=${rundeck.log.dir}${file.separator}rundeck.jobs.log
 log4j.appender.jobchanges.append=true
 log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
 log4j.appender.jobchanges.layout.ConversionPattern=${logger.jobchanges.format}
@@ -127,7 +127,7 @@ log4j.appender.jobchanges.layout.ConversionPattern=${logger.jobchanges.format}
 # Logs all execution events (start,finish,delete)
 #
 log4j.appender.execevents=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.execevents.file=${rundeck.log.dir}/rundeck.executions.log
+log4j.appender.execevents.file=${rundeck.log.dir}${file.separator}rundeck.executions.log
 log4j.appender.execevents.append=true
 log4j.appender.execevents.layout=org.apache.log4j.PatternLayout
 log4j.appender.execevents.layout.ConversionPattern=${logger.execevents.format}
@@ -138,7 +138,7 @@ log4j.appender.execevents.layout.ConversionPattern=${logger.execevents.format}
 # Logs all API requests
 #
 log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.apirequests.file=${rundeck.log.dir}/rundeck.api.log
+log4j.appender.apirequests.file=${rundeck.log.dir}${file.separator}rundeck.api.log
 log4j.appender.apirequests.append=true
 log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
 log4j.appender.apirequests.layout.ConversionPattern=${logger.apirequests.format}
@@ -149,7 +149,7 @@ log4j.appender.apirequests.layout.ConversionPattern=${logger.apirequests.format}
 # Logs all Web requests
 #
 log4j.appender.access=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.access.file=${rundeck.log.dir}/rundeck.access.log
+log4j.appender.access.file=${rundeck.log.dir}${file.separator}rundeck.access.log
 log4j.appender.access.append=true
 log4j.appender.access.layout=org.apache.log4j.PatternLayout
 log4j.appender.access.layout.ConversionPattern=${logger.access.format}