Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9D277200A5B for ; Wed, 25 May 2016 12:45:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9C185160A18; Wed, 25 May 2016 10:45:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E1E77160A17 for ; Wed, 25 May 2016 12:45:30 +0200 (CEST) Received: (qmail 17920 invoked by uid 500); 25 May 2016 10:45:30 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 17911 invoked by uid 99); 25 May 2016 10:45:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2016 10:45:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 025FFDFBAB; Wed, 25 May 2016 10:45:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavkul@apache.org To: commits@ambari.apache.org Message-Id: <4b8e43f17c4e4c62a8b5b07802ec3905@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-16779. Zeppelin Ambari stack does not handle log4j configuration (Renjith Kamath via pallavkul) Date: Wed, 25 May 2016 10:45:30 +0000 (UTC) archived-at: Wed, 25 May 2016 10:45:31 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 39b38a230 -> 7e26652ba AMBARI-16779. Zeppelin Ambari stack does not handle log4j configuration (Renjith Kamath via pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e26652b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e26652b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e26652b Branch: refs/heads/branch-2.4 Commit: 7e26652ba3f50c19cb36a307c68038d1af48ad76 Parents: 39b38a2 Author: Pallav Kulshreshtha Authored: Wed May 25 16:14:00 2016 +0530 Committer: Pallav Kulshreshtha Committed: Wed May 25 16:15:12 2016 +0530 ---------------------------------------------------------------------- .../0.6.0.2.5/configuration/zeppelin-env.xml | 17 +++++++++++++++++ .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 ++++ .../ZEPPELIN/0.6.0.2.5/package/scripts/params.py | 3 +++ 3 files changed, 24 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7e26652b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index 268f5d6..1da9bde 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -171,6 +171,23 @@ shiro.loginUrl = /api/login + log4j_properties_content + This is the content for log4j.properties file + +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.Threshold = 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 + + + + zeppelin.executor.mem 512m Executor memory to use (e.g. 512m or 1g) http://git-wip-us.apache.org/repos/asf/ambari/blob/7e26652b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index d079096..21b9947 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -147,6 +147,10 @@ class Master(Script): File(format("{params.conf_dir}/shiro.ini"), content=shiro_ini_content, owner=params.zeppelin_user, group=params.zeppelin_group) + # write out log4j.properties + File(format("{params.conf_dir}/log4j.properties"), content=params.log4j_properties_content, + owner=params.zeppelin_user, group=params.zeppelin_group) + def stop(self, env): import params self.create_zeppelin_log_dir(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/7e26652b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py index da260c2..a4efd72 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py @@ -86,6 +86,9 @@ zeppelin_env_content = config['configurations']['zeppelin-env']['zeppelin_env_co # shiro.ini shiro_ini_content = config['configurations']['zeppelin-env']['shiro_ini_content'] +# log4j.properties +log4j_properties_content = config['configurations']['zeppelin-env']['log4j_properties_content'] + # detect configs master_configs = config['clusterHostInfo'] java64_home = config['hostLevelParams']['java_home']