Repository: hive Updated Branches: refs/heads/branch-2.1 cf127f7af -> 6db2c5016
HIVE-14079: Remove file, method and line number from pattern layout (Prasanth Jayachandran reviewed by Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6db2c501 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6db2c501 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6db2c501 Branch: refs/heads/branch-2.1 Commit: 6db2c501614189faddaa6ea59ef2f04c45126c93 Parents: cf127f7 Author: Prasanth Jayachandran <[email protected]> Authored: Fri Jun 24 00:27:47 2016 -0700 Committer: Prasanth Jayachandran <[email protected]> Committed: Fri Jun 24 00:29:09 2016 -0700 ---------------------------------------------------------------------- common/src/main/resources/hive-log4j2.properties | 4 ++-- common/src/test/resources/hive-exec-log4j2-test.properties | 4 ++-- common/src/test/resources/hive-log4j2-test.properties | 4 ++-- data/conf/hive-log4j2.properties | 4 ++-- data/conf/spark/log4j2.properties | 4 ++-- .../e2e/templeton/deployers/config/hive/hive-log4j2.properties | 4 ++-- llap-server/src/main/resources/llap-cli-log4j2.properties | 3 +-- llap-server/src/main/resources/llap-daemon-log4j2.properties | 4 ++-- llap-server/src/test/resources/llap-daemon-log4j2.properties | 4 ++-- llap-server/src/test/resources/log4j2.properties | 2 +- ql/src/main/resources/hive-exec-log4j2.properties | 4 ++-- 11 files changed, 20 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/common/src/main/resources/hive-log4j2.properties ---------------------------------------------------------------------- diff --git a/common/src/main/resources/hive-log4j2.properties b/common/src/main/resources/hive-log4j2.properties index 2f67be8..ee2a1ff 100644 --- a/common/src/main/resources/hive-log4j2.properties +++ b/common/src/main/resources/hive-log4j2.properties @@ -33,7 +33,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # daily rolling file appender appender.DRFA.type = RollingRandomAccessFile @@ -42,7 +42,7 @@ appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} # Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout -appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy appender.DRFA.policies.time.interval = 1 http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/common/src/test/resources/hive-exec-log4j2-test.properties ---------------------------------------------------------------------- diff --git a/common/src/test/resources/hive-exec-log4j2-test.properties b/common/src/test/resources/hive-exec-log4j2-test.properties index 9afa5fe..cc8871e 100644 --- a/common/src/test/resources/hive-exec-log4j2-test.properties +++ b/common/src/test/resources/hive-exec-log4j2-test.properties @@ -32,14 +32,14 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # simple file appender appender.FA.type = File appender.FA.name = FA appender.FA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} appender.FA.layout.type = PatternLayout -appender.FA.layout.pattern = %d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n +appender.FA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # list of all loggers loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/common/src/test/resources/hive-log4j2-test.properties ---------------------------------------------------------------------- diff --git a/common/src/test/resources/hive-log4j2-test.properties b/common/src/test/resources/hive-log4j2-test.properties index ca69a8f..7fd5e42 100644 --- a/common/src/test/resources/hive-log4j2-test.properties +++ b/common/src/test/resources/hive-log4j2-test.properties @@ -32,7 +32,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # daily rolling file appender appender.DRFA.type = RollingFile @@ -40,7 +40,7 @@ appender.DRFA.name = DRFA appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout -appender.DRFA.layout.pattern = %d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy appender.DRFA.policies.time.interval = 1 http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/data/conf/hive-log4j2.properties ---------------------------------------------------------------------- diff --git a/data/conf/hive-log4j2.properties b/data/conf/hive-log4j2.properties index f60d5be..9122824 100644 --- a/data/conf/hive-log4j2.properties +++ b/data/conf/hive-log4j2.properties @@ -32,7 +32,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # daily rolling file appender appender.DRFA.type = RollingRandomAccessFile @@ -40,7 +40,7 @@ appender.DRFA.name = DRFA appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout -appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t%x]: %c{2} (%F:%M(%L)) - %m%n +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy appender.DRFA.policies.time.interval = 1 http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/data/conf/spark/log4j2.properties ---------------------------------------------------------------------- diff --git a/data/conf/spark/log4j2.properties b/data/conf/spark/log4j2.properties index 81f067d..c2deb4f 100644 --- a/data/conf/spark/log4j2.properties +++ b/data/conf/spark/log4j2.properties @@ -32,7 +32,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # daily rolling file appender appender.DRFA.type = RollingFile @@ -40,7 +40,7 @@ appender.DRFA.name = DRFA appender.DRFA.fileName = ${sys:spark.log.dir}/${sys:spark.log.file} appender.DRFA.filePattern = ${sys:spark.log.dir}/${sys:spark.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout -appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy appender.DRFA.policies.time.interval = 1 http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties ---------------------------------------------------------------------- diff --git a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties index c618297..1cf3bd6 100644 --- a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties +++ b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties @@ -32,7 +32,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # daily rolling file appender appender.DRFA.type = RollingFile @@ -40,7 +40,7 @@ appender.DRFA.name = DRFA appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout -appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy appender.DRFA.policies.time.interval = 1 http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/llap-server/src/main/resources/llap-cli-log4j2.properties ---------------------------------------------------------------------- diff --git a/llap-server/src/main/resources/llap-cli-log4j2.properties b/llap-server/src/main/resources/llap-cli-log4j2.properties index c6b8f20..f3c0f0e 100644 --- a/llap-server/src/main/resources/llap-cli-log4j2.properties +++ b/llap-server/src/main/resources/llap-cli-log4j2.properties @@ -32,7 +32,6 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -# appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n appender.console.layout.pattern = %p %c{2}: %m%n # daily rolling file appender @@ -42,7 +41,7 @@ appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} # Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout -appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy appender.DRFA.policies.time.interval = 1 http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/llap-server/src/main/resources/llap-daemon-log4j2.properties ---------------------------------------------------------------------- diff --git a/llap-server/src/main/resources/llap-daemon-log4j2.properties b/llap-server/src/main/resources/llap-daemon-log4j2.properties index c5166e3..7488ba2 100644 --- a/llap-server/src/main/resources/llap-daemon-log4j2.properties +++ b/llap-server/src/main/resources/llap-daemon-log4j2.properties @@ -35,7 +35,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t%x] %p %c{2} : %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t%x] %c{2}: %m%n # rolling file appender appender.RFA.type = RollingRandomAccessFile @@ -43,7 +43,7 @@ appender.RFA.name = RFA appender.RFA.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file} appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%i appender.RFA.layout.type = PatternLayout -appender.RFA.layout.pattern = %d{ISO8601} %-5p [%t%x]: %c{2} (%F:%M(%L)) - %m%n +appender.RFA.layout.pattern = %d{ISO8601} %5p [%t%x] %c{2}: %m%n appender.RFA.policies.type = Policies appender.RFA.policies.size.type = SizeBasedTriggeringPolicy appender.RFA.policies.size.size = ${sys:llap.daemon.log.maxfilesize} http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/llap-server/src/test/resources/llap-daemon-log4j2.properties ---------------------------------------------------------------------- diff --git a/llap-server/src/test/resources/llap-daemon-log4j2.properties b/llap-server/src/test/resources/llap-daemon-log4j2.properties index 2714dbd..dbf59e6 100644 --- a/llap-server/src/test/resources/llap-daemon-log4j2.properties +++ b/llap-server/src/test/resources/llap-daemon-log4j2.properties @@ -35,7 +35,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t%x] %p %c{2} : %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t%x] %c{2}: %m%n # rolling file appender appender.RFA.type = RollingRandomAccessFile @@ -43,7 +43,7 @@ appender.RFA.name = RFA appender.RFA.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file} appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%i appender.RFA.layout.type = PatternLayout -appender.RFA.layout.pattern = %d{ISO8601} %-5p [%t%x]: %c{2} (%F:%M(%L)) - %m%n +appender.RFA.layout.pattern = %d{ISO8601} %5p [%t%x] %c{2}: %m%n appender.RFA.policies.type = Policies appender.RFA.policies.size.type = SizeBasedTriggeringPolicy appender.RFA.policies.size.size = ${sys:llap.daemon.log.maxfilesize} http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/llap-server/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/llap-server/src/test/resources/log4j2.properties b/llap-server/src/test/resources/log4j2.properties index ad1b5ce..8bad9d8 100644 --- a/llap-server/src/test/resources/log4j2.properties +++ b/llap-server/src/test/resources/log4j2.properties @@ -30,7 +30,7 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_OUT appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{ISO8601} %-5p [%t%x] %c{2} (%F:%M(%L)) - %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t%x] %c{2}: %m%n # root logger rootLogger.level = ${sys:llap.daemon.log.level} http://git-wip-us.apache.org/repos/asf/hive/blob/6db2c501/ql/src/main/resources/hive-exec-log4j2.properties ---------------------------------------------------------------------- diff --git a/ql/src/main/resources/hive-exec-log4j2.properties b/ql/src/main/resources/hive-exec-log4j2.properties index 21e24fd..8a7dd02 100644 --- a/ql/src/main/resources/hive-exec-log4j2.properties +++ b/ql/src/main/resources/hive-exec-log4j2.properties @@ -33,14 +33,14 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # simple file appender appender.FA.type = RandomAccessFile appender.FA.name = FA appender.FA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} appender.FA.layout.type = PatternLayout -appender.FA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n +appender.FA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # list of all loggers loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
