Repository: incubator-zeppelin Updated Branches: refs/heads/master 1fc67f03b -> 53451e912
[MINOR] Set log4j.configuration into JAVA_OPTS and JAVA_INTP_OPTS explicitly ### What is this PR for? Set log4j into JVM option for enforcing logging configuration. ### What type of PR is it? [Bug Fix] ### Todos * [x] - Set "-Dlog4j.configuration=..." into JVM option ### What is the Jira issue? Minor issue ### How should this be tested? 1. Run spark with default log4j setting and check logs/zeppelin*.out. you can see logs from Spark. 1. Apply this patch. 1. Run spark with default log4j setting and check logs/zeppelin-interpreter*.log. you can see logs from Spark. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jongyoul Lee <[email protected]> Closes #830 from jongyoul/minor-set-log4j-explicitly and squashes the following commits: 2185284 [Jongyoul Lee] [MINOR] - Added "-Dlog4j.configuration" into JAVA_OPTS and JAVA_INTP_OPTS explicitly Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/53451e91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/53451e91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/53451e91 Branch: refs/heads/master Commit: 53451e91249c7ed960054927dbf6a17ce4ed968c Parents: 1fc67f0 Author: Jongyoul Lee <[email protected]> Authored: Tue Apr 12 10:21:52 2016 +0900 Committer: Jongyoul Lee <[email protected]> Committed: Thu Apr 14 08:46:20 2016 +0900 ---------------------------------------------------------------------- bin/common.sh | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/53451e91/bin/common.sh ---------------------------------------------------------------------- diff --git a/bin/common.sh b/bin/common.sh index 4d575e8..a70be7c 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -105,6 +105,7 @@ if [[ -z "$ZEPPELIN_MEM" ]]; then fi JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}" +JAVA_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties" export JAVA_OPTS # jvm options for interpreter process @@ -117,6 +118,7 @@ if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then fi JAVA_INTP_OPTS="${ZEPPELIN_INTP_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING}" +JAVA_INTP_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties" export JAVA_INTP_OPTS
