Revert "AMBARI-21191. Custom log4j.properties of Flume (wangjianfei via alejandro)"
This reverts commit df21f9c4b2577a1d801145b131b8a065c8d02a7e. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/242d79b8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/242d79b8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/242d79b8 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 242d79b8f5a2ced87a5d86b0caf5b7efa3678c89 Parents: 34b1e5f Author: Attila Doroszlai <[email protected]> Authored: Tue Jun 20 16:14:04 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Tue Jun 20 16:14:04 2017 +0200 ---------------------------------------------------------------------- .../1.4.0.2.0/configuration/flume-log4j.xml | 96 -------------------- .../FLUME/1.4.0.2.0/package/scripts/flume.py | 4 +- 2 files changed, 2 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/242d79b8/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-log4j.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-log4j.xml deleted file mode 100644 index fb9d7f8..0000000 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-log4j.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * 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. - */ ---> -<configuration supports_final="false"> - <property> - <name>content</name> - <display-name>flume-log4j template</display-name> - <description>Custom log4j.properties</description> - <value> -# 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. - - -# Define some default values that can be overridden by system properties. -# -# For testing, it may also be convenient to specify -# -Dflume.root.logger=DEBUG,console when launching flume. - -#flume.root.logger=DEBUG,console -flume.root.logger=INFO,LOGFILE -flume.log.dir={{flume_log_dir}} -flume.log.file=flume-{{agent_name}}.log - -log4j.logger.org.apache.flume.lifecycle = INFO -log4j.logger.org.jboss = WARN -log4j.logger.org.mortbay = INFO -log4j.logger.org.apache.avro.ipc.NettyTransceiver = WARN -log4j.logger.org.apache.hadoop = INFO - -# Define the root logger to the system property "flume.root.logger". -log4j.rootLogger=${flume.root.logger} - -# Stock log4j rolling file appender -# Default log rotation configuration -log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender -log4j.appender.LOGFILE.MaxFileSize=100MB -log4j.appender.LOGFILE.MaxBackupIndex=10 -log4j.appender.LOGFILE.File=${flume.log.dir}/${flume.log.file} -log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] (%C.%M:%L) %x - %m%n - -# Warning: If you enable the following appender it will fill up your disk if you don't have a cleanup job! -# This uses the updated rolling file appender from log4j-extras that supports a reliable time-based rolling policy. -# See http://logging.apache.org/log4j/companions/extras/apidocs/org/apache/log4j/rolling/TimeBasedRollingPolicy.html -# Add "DAILY" to flume.root.logger above if you want to use this -log4j.appender.DAILY=org.apache.log4j.rolling.RollingFileAppender -log4j.appender.DAILY.rollingPolicy=org.apache.log4j.rolling.TimeBasedRollingPolicy -log4j.appender.DAILY.rollingPolicy.ActiveFileName=${flume.log.dir}/${flume.log.file} -log4j.appender.DAILY.rollingPolicy.FileNamePattern=${flume.log.dir}/${flume.log.file}.%d{yyyy-MM-dd} -log4j.appender.DAILY.layout=org.apache.log4j.PatternLayout -log4j.appender.DAILY.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] (%C.%M:%L) %x - %m%n - -# console -# Add "console" to flume.root.logger above if you want to use this -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d (%t) [%p - %l] %m%n </value> - </property> - <value-attributes> - <type>content</type> - <show-property-name>false</show-property-name> - </value-attributes> - <on-ambari-upgrade add="true"/> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/242d79b8/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py index 0488298..6b1d286 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py @@ -74,7 +74,7 @@ def flume(action = None): properties=flume_agents[agent]) File(flume_agent_log4j_file, - content=InlineTemplate(params.flume_log4j_content,agent_name=agent)), + content=Template('log4j.properties.j2', agent_name = agent)) File(flume_agent_meta_file, content = json.dumps(ambari_meta(agent, flume_agents[agent]))) @@ -139,7 +139,7 @@ def flume(action = None): mode = 0644) File(flume_agent_log4j_file, - content=InlineTemplate(params.flume_log4j_content,agent_name=agent), + content=Template('log4j.properties.j2', agent_name = agent), owner=params.flume_user, mode = 0644)
