Repository: zeppelin Updated Branches: refs/heads/master 7da83eaa2 -> 93531b515
[MINOR] Update connect timeout to 60 seconds Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/93531b51 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/93531b51 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/93531b51 Branch: refs/heads/master Commit: 93531b515eb0d4c6b43006975f712a2a79b85e1a Parents: 7da83ea Author: Jeff Zhang <zjf...@apache.org> Authored: Mon Jun 25 11:18:21 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Mon Jun 25 11:18:21 2018 +0800 ---------------------------------------------------------------------- conf/log4j.properties2 | 33 +++++++++++++++++++++++++++++++++ conf/zeppelin-site.xml.template | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/93531b51/conf/log4j.properties2 ---------------------------------------------------------------------- diff --git a/conf/log4j.properties2 b/conf/log4j.properties2 new file mode 100644 index 0000000..d6c58f0 --- /dev/null +++ b/conf/log4j.properties2 @@ -0,0 +1,33 @@ +# +# 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. +# + +log4j.rootLogger = INFO, dailyfile + +log4j.appender.stdout = org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout = org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n + +log4j.appender.dailyfile.DatePattern=.yyyy-MM-dd +log4j.appender.dailyfile.DEBUG = INFO +log4j.appender.dailyfile = org.apache.log4j.DailyRollingFileAppender +log4j.appender.dailyfile.File = ${zeppelin.log.file} +log4j.appender.dailyfile.layout = org.apache.log4j.PatternLayout +log4j.appender.dailyfile.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n + + +log4j.logger.org.apache.zeppelin.python=DEBUG +log4j.logger.org.apache.zeppelin.spark=DEBUG http://git-wip-us.apache.org/repos/asf/zeppelin/blob/93531b51/conf/zeppelin-site.xml.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template index 098fed5..9f6fd6f 100755 --- a/conf/zeppelin-site.xml.template +++ b/conf/zeppelin-site.xml.template @@ -336,7 +336,7 @@ <property> <name>zeppelin.interpreter.connect.timeout</name> - <value>30000</value> + <value>60000</value> <description>Interpreter process connect timeout in msec.</description> </property>
