You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/09/11 01:28:16 UTC
ambari git commit: AMBARI-12964. update log4j file name to match
updated file name in atlas service (Jon Maron via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk e6a825696 -> 8de1efcab
AMBARI-12964. update log4j file name to match updated file name in atlas service (Jon Maron via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8de1efca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8de1efca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8de1efca
Branch: refs/heads/trunk
Commit: 8de1efcab298932b9ec51c5c31906008a3435aed
Parents: e6a8256
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Sep 10 16:28:07 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Sep 10 16:28:07 2015 -0700
----------------------------------------------------------------------
.../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 4 +-
.../0.1.0.2.3/package/files/atlas-log4j.xml | 84 ++++++++++++++++++++
.../ATLAS/0.1.0.2.3/package/files/log4j.xml | 84 --------------------
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 4 +-
.../stacks/2.3/ATLAS/test_metadata_server.py | 4 +-
5 files changed, 90 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de1efca/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
index 98b1a47..991d7fe 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
@@ -42,7 +42,7 @@
</property>
<property>
<name>metadata_opts</name>
- <value>-Xmx1024m</value>
+ <value>-Xmx1024m -Dlog4j.configuration=atlas-log4j.xml</value>
<description>Metadata Server command line options.</description>
</property>
<property>
@@ -70,7 +70,7 @@
export JAVA_HOME={{java64_home}}
# any additional java opts you want to set. This will apply to both client and server operations
-export METADATA_OPTS={{metadata_opts}}
+export METADATA_OPTS="{{metadata_opts}}"
# metadata configuration directory
export METADATA_CONF={{conf_dir}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de1efca/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/atlas-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/atlas-log4j.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/atlas-log4j.xml
new file mode 100644
index 0000000..42d3c47
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/atlas-log4j.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ 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.
+ -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="${atlas.log.dir}/application.log"/>
+ <param name="Append" value="true"/>
+ <param name="Threshold" value="debug"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
+ </layout>
+ </appender>
+
+ <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="${atlas.log.dir}/audit.log"/>
+ <param name="Append" value="true"/>
+ <param name="Threshold" value="debug"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %x %m%n"/>
+ </layout>
+ </appender>
+
+ <logger name="org.apache.atlas" additivity="false">
+ <level value="debug"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+
+ <logger name="com.thinkaurelius.titan" additivity="false">
+ <level value="info"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <logger name="org.elasticsearch" additivity="false">
+ <level value="info"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <logger name="org.apache.lucene" additivity="false">
+ <level value="info"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <logger name="com.google" additivity="false">
+ <level value="info"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <logger name="AUDIT">
+ <level value="info"/>
+ <appender-ref ref="AUDIT"/>
+ </logger>
+
+ <root>
+ <priority value="info"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de1efca/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
deleted file mode 100644
index 42d3c47..0000000
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="${atlas.log.dir}/application.log"/>
- <param name="Append" value="true"/>
- <param name="Threshold" value="debug"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
- </layout>
- </appender>
-
- <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="${atlas.log.dir}/audit.log"/>
- <param name="Append" value="true"/>
- <param name="Threshold" value="debug"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %x %m%n"/>
- </layout>
- </appender>
-
- <logger name="org.apache.atlas" additivity="false">
- <level value="debug"/>
- <appender-ref ref="FILE"/>
- </logger>
-
-
- <logger name="com.thinkaurelius.titan" additivity="false">
- <level value="info"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="org.elasticsearch" additivity="false">
- <level value="info"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="org.apache.lucene" additivity="false">
- <level value="info"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="com.google" additivity="false">
- <level value="info"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="AUDIT">
- <level value="info"/>
- <appender-ref ref="AUDIT"/>
- </logger>
-
- <root>
- <priority value="info"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de1efca/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index a1627b9..2dbb273 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -83,9 +83,9 @@ def metadata():
content=InlineTemplate(params.metadata_env_content)
)
- File(format("{conf_dir}/log4j.xml"),
+ File(format("{conf_dir}/atlas-log4j.xml"),
mode=0644,
owner=params.metadata_user,
group=params.user_group,
- content=StaticFile('log4j.xml')
+ content=StaticFile('atlas-log4j.xml')
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de1efca/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
index 77933e4..8dbb1fa 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
@@ -89,8 +89,8 @@ class TestMetadataServer(RMFTestCase):
group='hadoop',
mode=0755,
)
- self.assertResourceCalled('File', '/etc/atlas/conf/log4j.xml',
- content=StaticFile('log4j.xml'),
+ self.assertResourceCalled('File', '/etc/atlas/conf/atlas-log4j.xml',
+ content=StaticFile('atlas-log4j.xml'),
owner='atlas',
group='hadoop',
mode=0644,