ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pallav...@apache.org
Subject ambari git commit: AMBARI-16779. Zeppelin Ambari stack does not handle log4j configuration (Renjith Kamath via pallavkul)
Date Wed, 25 May 2016 10:44:17 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7fa34c718 -> 2ca4b333d


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/2ca4b333
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ca4b333
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ca4b333

Branch: refs/heads/trunk
Commit: 2ca4b333d0777640e1907dc59a20daa147f69253
Parents: 7fa34c7
Author: Pallav Kulshreshtha <pallav.kul@gmail.com>
Authored: Wed May 25 16:14:00 2016 +0530
Committer: Pallav Kulshreshtha <pallav.kul@gmail.com>
Committed: Wed May 25 16:14:00 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/2ca4b333/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
   </property>
 
   <property>
+  <name>log4j_properties_content</name>
+  <description>This is the content for log4j.properties file</description>
+  <value>
+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
+  </value>
+  </property>
+
+  <property>
     <name>zeppelin.executor.mem</name>
     <value>512m</value>
     <description>Executor memory to use (e.g. 512m or 1g)</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ca4b333/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/2ca4b333/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']


Mime
View raw message