DRILL-829: Use ISO8601 date/time format in log file
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/5c8061e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/5c8061e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/5c8061e0 Branch: refs/heads/master Commit: 5c8061e0356e0ac231c315b5fc035ea60f482f2f Parents: 06de999 Author: Aditya Kishore <[email protected]> Authored: Fri May 23 12:09:14 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Wed May 28 09:16:03 2014 -0700 ---------------------------------------------------------------------- distribution/src/resources/logback.xml | 70 ++++++++++++---------- exec/java-exec/src/main/resources/logback.xml | 42 ++++++------- 2 files changed, 59 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5c8061e0/distribution/src/resources/logback.xml ---------------------------------------------------------------------- diff --git a/distribution/src/resources/logback.xml b/distribution/src/resources/logback.xml index 3ee676b..b751894 100644 --- a/distribution/src/resources/logback.xml +++ b/distribution/src/resources/logback.xml @@ -1,29 +1,35 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - You under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <configuration> - <appender name="SOCKET" - class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> - <Compressing>true</Compressing> - <ReconnectionDelay>10000</ReconnectionDelay> - <IncludeCallerData>true</IncludeCallerData> - <RemoteHosts>localhost</RemoteHosts> - </appender> - - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - </pattern> - </encoder> - </appender> + <appender name="SOCKET" + class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> + <Compressing>true</Compressing> + <ReconnectionDelay>10000</ReconnectionDelay> + <IncludeCallerData>true</IncludeCallerData> + <RemoteHosts>localhost</RemoteHosts> + </appender> + + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + </pattern> + </encoder> + </appender> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${log.path}</file> @@ -37,23 +43,23 @@ <maxFileSize>100MB</maxFileSize> </triggeringPolicy> <encoder> - <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> + <pattern>%date{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern> </encoder> </appender> - <logger name="org.apache.drill" additivity="false"> - <level value="info" /> + <logger name="org.apache.drill" additivity="false"> + <level value="info" /> <appender-ref ref="FILE" /> - </logger> + </logger> <logger name="org.apache.drill" additivity="false"> <level value="debug" /> <appender-ref ref="SOCKET" /> </logger> - <root> - <level value="error" /> - <appender-ref ref="STDOUT" /> - </root> + <root> + <level value="error" /> + <appender-ref ref="STDOUT" /> + </root> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5c8061e0/exec/java-exec/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/resources/logback.xml b/exec/java-exec/src/main/resources/logback.xml index 35f0260..b751894 100644 --- a/exec/java-exec/src/main/resources/logback.xml +++ b/exec/java-exec/src/main/resources/logback.xml @@ -16,20 +16,20 @@ limitations under the License. --> <configuration> - <appender name="SOCKET" - class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> - <Compressing>true</Compressing> - <ReconnectionDelay>10000</ReconnectionDelay> - <IncludeCallerData>true</IncludeCallerData> - <RemoteHosts>localhost</RemoteHosts> - </appender> + <appender name="SOCKET" + class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> + <Compressing>true</Compressing> + <ReconnectionDelay>10000</ReconnectionDelay> + <IncludeCallerData>true</IncludeCallerData> + <RemoteHosts>localhost</RemoteHosts> + </appender> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - </pattern> - </encoder> - </appender> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + </pattern> + </encoder> + </appender> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${log.path}</file> @@ -43,23 +43,23 @@ <maxFileSize>100MB</maxFileSize> </triggeringPolicy> <encoder> - <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> + <pattern>%date{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern> </encoder> </appender> - <logger name="org.apache.drill" additivity="false"> - <level value="info" /> + <logger name="org.apache.drill" additivity="false"> + <level value="info" /> <appender-ref ref="FILE" /> - </logger> + </logger> <logger name="org.apache.drill" additivity="false"> <level value="debug" /> <appender-ref ref="SOCKET" /> </logger> - <root> - <level value="error" /> - <appender-ref ref="STDOUT" /> - </root> + <root> + <level value="error" /> + <appender-ref ref="STDOUT" /> + </root> </configuration>
