[FLINK-3334] [conf] Include year-month-day in the log output
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d51bec15 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d51bec15 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d51bec15 Branch: refs/heads/master Commit: d51bec1524a9832a7e6c0f6c5d5be5a42712d365 Parents: 457cb14 Author: Stephan Ewen <se...@apache.org> Authored: Mon Feb 8 17:38:52 2016 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Mon Feb 8 19:59:31 2016 +0100 ---------------------------------------------------------------------- flink-dist/src/main/flink-bin/conf/log4j-cli.properties | 4 ++-- .../src/main/flink-bin/conf/log4j-yarn-session.properties | 2 +- flink-dist/src/main/flink-bin/conf/log4j.properties | 2 +- flink-dist/src/main/flink-bin/conf/logback-yarn.xml | 6 +++--- flink-dist/src/main/flink-bin/conf/logback.xml | 5 +++-- 5 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/d51bec15/flink-dist/src/main/flink-bin/conf/log4j-cli.properties ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/conf/log4j-cli.properties b/flink-dist/src/main/flink-bin/conf/log4j-cli.properties index 9c56e61..acb9d1a 100644 --- a/flink-dist/src/main/flink-bin/conf/log4j-cli.properties +++ b/flink-dist/src/main/flink-bin/conf/log4j-cli.properties @@ -23,7 +23,7 @@ log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.file=${log.file} log4j.appender.file.append=false log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n +log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %-60c %x - %m%n # Log output from org.apache.flink.yarn to the console. This is used by the @@ -34,7 +34,7 @@ log4j.logger.org.apache.hadoop=INFO, console log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n +log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %-60c %x - %m%n # suppress the warning that hadoop native libraries are not loaded (irrelevant for the client) log4j.logger.org.apache.hadoop.util.NativeCodeLoader=OFF http://git-wip-us.apache.org/repos/asf/flink/blob/d51bec15/flink-dist/src/main/flink-bin/conf/log4j-yarn-session.properties ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/conf/log4j-yarn-session.properties b/flink-dist/src/main/flink-bin/conf/log4j-yarn-session.properties index 1f49676..07f65a7 100644 --- a/flink-dist/src/main/flink-bin/conf/log4j-yarn-session.properties +++ b/flink-dist/src/main/flink-bin/conf/log4j-yarn-session.properties @@ -21,7 +21,7 @@ log4j.rootLogger=INFO, stdout # Log all infos in the given file log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %-60c %x - %m%n # suppress the irrelevant (wrong) warnings from the netty channel handler log4j.logger.org.jboss.netty.channel.DefaultChannelPipeline=ERROR, stdout http://git-wip-us.apache.org/repos/asf/flink/blob/d51bec15/flink-dist/src/main/flink-bin/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/conf/log4j.properties b/flink-dist/src/main/flink-bin/conf/log4j.properties index adcff38..97ec653 100644 --- a/flink-dist/src/main/flink-bin/conf/log4j.properties +++ b/flink-dist/src/main/flink-bin/conf/log4j.properties @@ -23,7 +23,7 @@ log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.file=${log.file} log4j.appender.file.append=false log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n +log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %-60c %x - %m%n # suppress the irrelevant (wrong) warnings from the netty channel handler log4j.logger.org.jboss.netty.channel.DefaultChannelPipeline=ERROR, file http://git-wip-us.apache.org/repos/asf/flink/blob/d51bec15/flink-dist/src/main/flink-bin/conf/logback-yarn.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/conf/logback-yarn.xml b/flink-dist/src/main/flink-bin/conf/logback-yarn.xml index c5511b3..636b78a 100644 --- a/flink-dist/src/main/flink-bin/conf/logback-yarn.xml +++ b/flink-dist/src/main/flink-bin/conf/logback-yarn.xml @@ -21,13 +21,13 @@ <file>${log.file}</file> <append>false</append> <encoder> - <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern> + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern> </encoder> </appender> <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <encoder> - <pattern>%d{HH:mm:ss} %-5level %logger{60} %X{sourceThread} - %msg%n</pattern> + <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{60} %X{sourceThread} - %msg%n</pattern> </encoder> </appender> @@ -36,4 +36,4 @@ <appender-ref ref="file"/> <appender-ref ref="console"/> </root> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/flink/blob/d51bec15/flink-dist/src/main/flink-bin/conf/logback.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/conf/logback.xml b/flink-dist/src/main/flink-bin/conf/logback.xml index 9305b11..1147a70 100644 --- a/flink-dist/src/main/flink-bin/conf/logback.xml +++ b/flink-dist/src/main/flink-bin/conf/logback.xml @@ -21,11 +21,12 @@ <file>${log.file}</file> <append>false</append> <encoder> - <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern> + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern> </encoder> </appender> <root level="INFO"> <appender-ref ref="file"/> </root> -</configuration> \ No newline at end of file +</configuration> +
