KYLIN-1751 Cleanup log4j properties file
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e40ba059 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e40ba059 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e40ba059 Branch: refs/heads/1.5.x-CDH5.7 Commit: e40ba05913d09dc406e1b16ae542b9bfed95635a Parents: 57295d6 Author: lidongsjtu <lid...@apache.org> Authored: Tue May 31 12:55:48 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Tue May 31 12:55:48 2016 +0800 ---------------------------------------------------------------------- build/bin/kylin.sh | 2 +- build/conf/kylin-server-log4j.properties | 30 +++++++++++ .../resources/kylin-server-log4j.properties | 53 -------------------- 3 files changed, 31 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e40ba059/build/bin/kylin.sh ---------------------------------------------------------------------- diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh index 0e503ee..0e5d236 100644 --- a/build/bin/kylin.sh +++ b/build/bin/kylin.sh @@ -78,8 +78,8 @@ then # KYLIN_EXTRA_START_OPTS is for customized settings, checkout bin/setenv.sh hbase ${KYLIN_EXTRA_START_OPTS} \ - -Djava.util.logging.config.file=${tomcat_root}/conf/logging.properties \ -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ + -Dlog4j.configuration=kylin-server-log4j.properties \ -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \ -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true \ -Djava.endorsed.dirs=${tomcat_root}/endorsed \ http://git-wip-us.apache.org/repos/asf/kylin/blob/e40ba059/build/conf/kylin-server-log4j.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin-server-log4j.properties b/build/conf/kylin-server-log4j.properties new file mode 100644 index 0000000..3750fb1 --- /dev/null +++ b/build/conf/kylin-server-log4j.properties @@ -0,0 +1,30 @@ +# +# 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. +# + + +#define appenders +log4j.appender.file=org.apache.log4j.DailyRollingFileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.File=logs/kylin.log +log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}:%L : %m%n +log4j.appender.file.Append=true + +#overall config +log4j.rootLogger=INFo,file +log4j.logger.org.apache.kylin=DEBUG +log4j.logger.org.springframework=WARN +log4j.logger.org.springframework.security=INFO \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/e40ba059/server/src/main/resources/kylin-server-log4j.properties ---------------------------------------------------------------------- diff --git a/server/src/main/resources/kylin-server-log4j.properties b/server/src/main/resources/kylin-server-log4j.properties deleted file mode 100644 index 4ad7721..0000000 --- a/server/src/main/resources/kylin-server-log4j.properties +++ /dev/null @@ -1,53 +0,0 @@ -# -# 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. -# - - -#define appenders -log4j.appender.file=org.apache.log4j.DailyRollingFileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.File=${catalina.home}/../logs/kylin.log -log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}:%L : %m%n -log4j.appender.file.Append=true - -log4j.appender.query=org.apache.log4j.DailyRollingFileAppender -log4j.appender.query.layout=org.apache.log4j.PatternLayout -log4j.appender.query.File=${catalina.home}/../logs/kylin_query.log -log4j.appender.query.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}:%L : %m%n -log4j.appender.query.Append=true - -log4j.appender.job=org.apache.log4j.DailyRollingFileAppender -log4j.appender.job.layout=org.apache.log4j.PatternLayout -log4j.appender.job.File=${catalina.home}/../logs/kylin_job.log -log4j.appender.job.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}:%L : %m%n -log4j.appender.job.Append=true - -#overall config -log4j.rootLogger=INFO,file -log4j.logger.org.apache.kylin=DEBUG -log4j.logger.org.springframework=WARN -log4j.logger.org.springframework.security=INFO - -#query config -log4j.logger.org.apache.kylin.rest.controller.QueryController=DEBUG, query -log4j.logger.org.apache.kylin.rest.service.QueryService=DEBUG, query -log4j.logger.org.apache.kylin.query=DEBUG, query -#log4j.logger.org.apache.kylin.storage=DEBUG, query //too many stuff in storage package now - -#job config -log4j.logger.org.apache.kylin.rest.controller.JobController=DEBUG, job -log4j.logger.org.apache.kylin.rest.service.JobService=DEBUG, job -log4j.logger.org.apache.kylin.job=DEBUG, job
