diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index 3186836050b..c9cd6f32e8d 100644
--- a/log4j2/cluster.xml
+++ b/log4j2/cluster.xml
@@ -17,75 +17,75 @@
 -->
 
 <configuration monitorInterval="60" shutdownHook="disable">
-<properties>
-    <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property>
-</properties>
-<appenders>
-    <RollingFile name="A1" 
-                 fileName="${sys:storm.log.dir}/${sys:logfile.name}"
-                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i.gz">
-        <PatternLayout charset="UTF-8">
-            <pattern>${pattern}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <RollingFile name="WEB-ACCESS" 
-                 fileName="${sys:storm.log.dir}/access-web-${sys:daemon.name}.log"
-                 filePattern="${sys:storm.log.dir}/access-web-${sys:daemon.name}.log.%i.gz">
+    <properties>
+        <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property>
+    </properties>
+    <appenders>
+        <RollingFile name="A1"
+                     fileName="${sys:storm.log.dir}/${sys:logfile.name}"
+                     filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i.gz">
+            <PatternLayout charset="UTF-8">
+                <pattern>${pattern}</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+            </Policies>
+            <DefaultRolloverStrategy max="9"/>
+        </RollingFile>
+        <RollingFile name="WEB-ACCESS"
+                     fileName="${sys:storm.log.dir}/access-web-${sys:daemon.name}.log"
+                     filePattern="${sys:storm.log.dir}/access-web-${sys:daemon.name}.log.%i.gz">
+            <PatternLayout>
+                <pattern>${pattern}</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+            </Policies>
+            <DefaultRolloverStrategy max="9"/>
+        </RollingFile>
+        <RollingFile name="THRIFT-ACCESS"
+                     fileName="${sys:storm.log.dir}/access-${sys:logfile.name}"
+                     filePattern="${sys:storm.log.dir}/access-${sys:logfile.name}.%i.gz">
         <PatternLayout>
             <pattern>${pattern}</pattern>
         </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <RollingFile name="THRIFT-ACCESS" 
-                 fileName="${sys:storm.log.dir}/access-${sys:logfile.name}"
-                 filePattern="${sys:storm.log.dir}/access-${sys:logfile.name}.%i.gz">
-    <PatternLayout>
-        <pattern>${pattern}</pattern>
-    </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <RollingFile name="METRICS"
-                 fileName="${sys:storm.log.dir}/${sys:logfile.name}.metrics"
-                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.metrics.%i.gz">
-        <PatternLayout>
-            <pattern>${patternMetrics}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="2 MB"/>
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <Syslog name="syslog" format="RFC5424" charset="UTF-8" host="localhost" port="514"
-            protocol="UDP" appName="[${sys:daemon.name}]" mdcId="mdc" includeMDC="true"
-            facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
-            messageId="[${sys:user.name}:S0]" id="storm" immediateFlush="true" immediateFail="true"/>
-</appenders>
-<loggers>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+            </Policies>
+            <DefaultRolloverStrategy max="9"/>
+        </RollingFile>
+        <RollingFile name="METRICS"
+                     fileName="${sys:storm.log.dir}/${sys:logfile.name}.metrics"
+                     filePattern="${sys:storm.log.dir}/${sys:logfile.name}.metrics.%i.gz">
+            <PatternLayout>
+                <pattern>${patternMetrics}</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="2 MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="9"/>
+        </RollingFile>
+        <Syslog name="syslog" format="RFC5424" charset="UTF-8" host="localhost" port="514"
+                protocol="UDP" appName="[${sys:daemon.name}]" mdcId="mdc" includeMDC="true"
+                facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
+                messageId="[${sys:user.name}:S0]" id="storm" immediateFlush="true" immediateFail="true"/>
+    </appenders>
+    <loggers>
 
-    <Logger name="org.apache.storm.logging.filters.AccessLoggingFilter" level="info" additivity="false">
-        <AppenderRef ref="WEB-ACCESS"/>
-        <AppenderRef ref="syslog"/>
-    </Logger>
-    <Logger name="org.apache.storm.logging.ThriftAccessLogger" level="info" additivity="false">
-        <AppenderRef ref="THRIFT-ACCESS"/>
-        <AppenderRef ref="syslog"/>
-    </Logger>
-    <Logger name="org.apache.storm.metric.LoggingClusterMetricsConsumer" level="info" additivity="false">
-        <appender-ref ref="METRICS"/>
-    </Logger>
-    <root level="info"> <!-- We log everything -->
-        <appender-ref ref="A1"/>
-        <appender-ref ref="syslog"/>
-    </root>
-</loggers>
+        <Logger name="org.apache.storm.logging.filters.AccessLoggingFilter" level="info" additivity="false">
+            <AppenderRef ref="WEB-ACCESS"/>
+            <AppenderRef ref="syslog"/>
+        </Logger>
+        <Logger name="org.apache.storm.logging.ThriftAccessLogger" level="info" additivity="false">
+            <AppenderRef ref="THRIFT-ACCESS"/>
+            <AppenderRef ref="syslog"/>
+        </Logger>
+        <Logger name="org.apache.storm.metric.LoggingClusterMetricsConsumer" level="info" additivity="false">
+            <appender-ref ref="METRICS"/>
+        </Logger>
+        <root level="info"> <!-- We log everything -->
+            <appender-ref ref="A1"/>
+            <appender-ref ref="syslog"/>
+        </root>
+    </loggers>
 </configuration>
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index 6e73b446642..81e515b8d37 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -17,76 +17,76 @@
 -->
 
 <configuration monitorInterval="60" shutdownHook="disable">
-<properties>
-    <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property>
-    <property name="patternNoTime">%msg%n</property>
-    <property name="patternMetrics">%d %-8r %m%n</property>
-</properties>
-<appenders>
-    <RollingFile name="A1"
-		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}"
-		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.%i.gz">
-        <PatternLayout charset="UTF-8">
-            <pattern>${pattern}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <RollingFile name="STDOUT"
-		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.out"
-		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.out.%i.gz">
-        <PatternLayout>
-            <pattern>${patternNoTime}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="4"/>
-    </RollingFile>
-    <RollingFile name="STDERR"
-		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.err"
-		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.err.%i.gz">
-        <PatternLayout>
-            <pattern>${patternNoTime}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="4"/>
-    </RollingFile>
-    <RollingFile name="METRICS"
-		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.metrics"
-		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.metrics.%i.gz">
-        <PatternLayout>
-            <pattern>${patternMetrics}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="2 MB"/>
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <Syslog name="syslog" format="RFC5424" charset="UTF-8" host="localhost" port="514"
-        protocol="UDP" appName="[${sys:storm.id}:${sys:worker.port}]" mdcId="mdc" includeMDC="true"
-        facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
-        messageId="[${sys:user.name}:${sys:logging.sensitivity}]" id="storm" immediateFail="true" immediateFlush="true"/>
-</appenders>
-<loggers>
-    <root level="info"> <!-- We log everything -->
-        <appender-ref ref="A1"/>
-        <appender-ref ref="syslog"/>
-    </root>
-    <Logger name="org.apache.storm.metric.LoggingMetricsConsumer" level="info" additivity="false">
-        <appender-ref ref="METRICS"/>
-    </Logger>
-    <Logger name="STDERR" level="INFO">
-        <appender-ref ref="STDERR"/>
-        <appender-ref ref="syslog"/>
-    </Logger>
-    <Logger name="STDOUT" level="INFO">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="syslog"/>
-    </Logger>
-</loggers>
+    <properties>
+        <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property>
+        <property name="patternNoTime">%msg%n</property>
+        <property name="patternMetrics">%d %-8r %m%n</property>
+    </properties>
+    <appenders>
+        <RollingFile name="A1"
+    		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}"
+    		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.%i.gz">
+            <PatternLayout charset="UTF-8">
+                <pattern>${pattern}</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+            </Policies>
+            <DefaultRolloverStrategy max="9"/>
+        </RollingFile>
+        <RollingFile name="STDOUT"
+    		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.out"
+    		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.out.%i.gz">
+            <PatternLayout>
+                <pattern>${patternNoTime}</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+            </Policies>
+            <DefaultRolloverStrategy max="4"/>
+        </RollingFile>
+        <RollingFile name="STDERR"
+    		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.err"
+    		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.err.%i.gz">
+            <PatternLayout>
+                <pattern>${patternNoTime}</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+            </Policies>
+            <DefaultRolloverStrategy max="4"/>
+        </RollingFile>
+        <RollingFile name="METRICS"
+    		fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.metrics"
+    		filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.metrics.%i.gz">
+            <PatternLayout>
+                <pattern>${patternMetrics}</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="2 MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="9"/>
+        </RollingFile>
+        <Syslog name="syslog" format="RFC5424" charset="UTF-8" host="localhost" port="514"
+            protocol="UDP" appName="[${sys:storm.id}:${sys:worker.port}]" mdcId="mdc" includeMDC="true"
+            facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
+            messageId="[${sys:user.name}:${sys:logging.sensitivity}]" id="storm" immediateFail="true" immediateFlush="true"/>
+    </appenders>
+    <loggers>
+        <root level="info"> <!-- We log everything -->
+            <appender-ref ref="A1"/>
+            <appender-ref ref="syslog"/>
+        </root>
+        <Logger name="org.apache.storm.metric.LoggingMetricsConsumer" level="info" additivity="false">
+            <appender-ref ref="METRICS"/>
+        </Logger>
+        <Logger name="STDERR" level="INFO">
+            <appender-ref ref="STDERR"/>
+            <appender-ref ref="syslog"/>
+        </Logger>
+        <Logger name="STDOUT" level="INFO">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="syslog"/>
+        </Logger>
+    </loggers>
 </configuration>