Updated Branches: refs/heads/master 8e05df951 -> 24a47afe1
Removed duplicated log4j.properties file in autoscaler and updated bin.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/24a47afe Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/24a47afe Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/24a47afe Branch: refs/heads/master Commit: 24a47afe17dad6c1e824629695b9879a7d5840f5 Parents: 8e05df9 Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 26 10:47:24 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 26 10:47:24 2013 +0530 ---------------------------------------------------------------------- .../distribution/src/main/assembly/bin.xml | 6 +- .../distribution/src/main/conf/log4j.properties | 16 +- .../src/main/resources/log4j.properties | 168 ------------------- 3 files changed, 10 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/24a47afe/products/autoscaler/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml index 04e9898..6c19e86 100644 --- a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml +++ b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml @@ -29,7 +29,7 @@ <excludes> <exclude>**/*.sh</exclude> <exclude>**/*.bat</exclude> - <exclude>**/log4j.properties</exclude> + <exclude>**/conf/log4j.properties</exclude> <exclude>**/conf/axis2/axis2.xml</exclude> <exclude>**/services/sample01.aar</exclude> <exclude>**/repository/services/version/**</exclude> @@ -246,10 +246,10 @@ <fileMode>755</fileMode> </file> <file> - <source>src/main/resources/log4j.properties</source> + <source>src/main/conf/log4j.properties</source> <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf</outputDirectory> <filtered>true</filtered> - <fileMode>755</fileMode> + <fileMode>600</fileMode> </file> <file> <source>src/main/resources/stratos.bat</source> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/24a47afe/products/autoscaler/modules/distribution/src/main/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/conf/log4j.properties b/products/autoscaler/modules/distribution/src/main/conf/log4j.properties index e9eaaab..453ed7a 100644 --- a/products/autoscaler/modules/distribution/src/main/conf/log4j.properties +++ b/products/autoscaler/modules/distribution/src/main/conf/log4j.properties @@ -18,19 +18,14 @@ # # -# This is the log4j configuration file used by WSO2 Carbon -# -# IMPORTANT : Please do not remove or change the names of any -# of the Appenders defined here. The layout pattern & log file -# can be changed using the WSO2 Carbon Management Console, and those -# settings will override the settings in this file. +# This is the log4j configuration file used by Auto-Scaler # log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE +log4j.logger.org.apache.axis2.clustering=INFO log4j.logger.org.apache=INFO log4j.logger.org.apache.catalina=WARN log4j.logger.org.apache.tomcat=WARN @@ -56,6 +51,7 @@ log4j.logger.org.jgroups=ERROR log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR log4j.logger.org.wso2=INFO +# Apache Stratos logging configuration log4j.logger.org.apache.stratos.autoscaler=INFO log4j.logger.org.apache.stratos.messaging=INFO log4j.logger.org.wso2.andes.client=ERROR @@ -64,13 +60,15 @@ log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY -#Following are to remove false error messages from startup (IS) + +# Following are to remove false error messages from startup (IS) log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY -#Hive Related Log configurations + +# Hive logging configuration log4j.logger.DataNucleus=ERROR log4j.logger.Datastore=ERROR log4j.logger.Datastore.Schema=ERROR http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/24a47afe/products/autoscaler/modules/distribution/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/resources/log4j.properties b/products/autoscaler/modules/distribution/src/main/resources/log4j.properties deleted file mode 100644 index d61aa71..0000000 --- a/products/autoscaler/modules/distribution/src/main/resources/log4j.properties +++ /dev/null @@ -1,168 +0,0 @@ -# -# 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. -# - -# -# This is the log4j configuration file used by WSO2 Carbon -# -# IMPORTANT : Please do not remove or change the names of any -# of the Appenders defined here. The layout pattern & log file -# can be changed using the WSO2 Carbon Management Console, and those -# settings will override the settings in this file. -# - -log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG - -log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE -log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.axis2.clustering=INFO -log4j.logger.org.apache=INFO -log4j.logger.org.apache.catalina=WARN -log4j.logger.org.apache.tomcat=WARN -log4j.logger.org.wso2.carbon.apacheds=WARN -log4j.logger.org.apache.directory.server.ldap=WARN -log4j.logger.org.apache.directory.server.core.event=WARN -log4j.logger.com.atomikos=INFO,ATOMIKOS -log4j.logger.org.quartz=WARN -log4j.logger.org.apache.jackrabbit.webdav=WARN -log4j.logger.org.apache.juddi=ERROR -log4j.logger.org.apache.commons.digester.Digester=WARN -log4j.logger.org.apache.jasper.compiler.TldLocationsCache=WARN -log4j.logger.org.apache.qpid=WARN -log4j.logger.org.apache.qpid.server.Main=INFO -log4j.logger.qpid.message=WARN -log4j.logger.qpid.message.broker.listening=INFO -log4j.logger.org.apache.tiles=WARN -log4j.logger.org.apache.commons.httpclient=ERROR -log4j.logger.org.apache.coyote=WARN -log4j.logger.org.apache.solr=ERROR -log4j.logger.org.infinispan=WARN -log4j.logger.org.jgroups=ERROR -log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR -log4j.logger.org.wso2=INFO -log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY -#Following are to remove false error messages from startup (IS) -log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY -#Hive Related Log configurations -log4j.logger.DataNucleus=ERROR -log4j.logger.Datastore=ERROR -log4j.logger.Datastore.Schema=ERROR -log4j.logger.JPOX.Datastore=ERROR -log4j.logger.JPOX.Plugin=ERROR -log4j.logger.JPOX.MetaData=ERROR -log4j.logger.JPOX.Query=ERROR -log4j.logger.JPOX.General=ERROR -log4j.logger.JPOX.Enhancer=ERROR -log4j.logger.org.apache.hadoop.hive=WARN -log4j.logger.hive=WARN -log4j.logger.ExecMapper=WARN -log4j.logger.ExecReducer=WARN -log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR -log4j.logger.org.apache.axis2.clustering.tribes.Axis2GroupChannel=FATAL - -log4j.logger.trace.messages=TRACE,CARBON_TRACE_LOGFILE - -log4j.additivity.org.apache.axis2.clustering=false -log4j.additivity.com.atomikos=false - -# CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout. -log4j.appender.CARBON_CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CARBON_CONSOLE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -# ConversionPattern will be overridden by the configuration setting in the DB -log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n -log4j.appender.CARBON_CONSOLE.layout.TenantPattern=%U%@%D[%T] -log4j.appender.CARBON_CONSOLE.threshold=DEBUG - -# CARBON_MEMORY is set to be a MemoryAppender using a PatternLayout. -log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.appenders.MemoryAppender -log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout -log4j.appender.CARBON_MEMORY.bufferSize=200 -# ConversionPattern will be overridden by the configuration setting in the DB -#log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n -log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m%n -log4j.appender.CARBON_MEMORY.threshold=DEBUG - - -# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout. -log4j.appender.CARBON_LOGFILE=org.apache.log4j.DailyRollingFileAppender -# Log file will be overridden by the configuration setting in the DB -# This path should be relative to WSO2 Carbon Home -log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log -log4j.appender.CARBON_LOGFILE.Append=true -log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -# ConversionPattern will be overridden by the configuration setting in the DB -log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n -log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] -log4j.appender.CARBON_LOGFILE.threshold=DEBUG - -log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender -log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout -log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p {%c} - %x %m {%c}%n -log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost -log4j.appender.CARBON_SYS_LOG.Facility=USER -log4j.appender.CARBON_SYS_LOG.threshold=DEBUG - -# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT -log4j.appender.LOGEVENT=org.wso2.carbon.logging.appender.LogEventAppender -log4j.appender.LOGEVENT.url=tcp://10.100.3.103:7611 -log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace -log4j.appender.LOGEVENT.userName=admin -log4j.appender.LOGEVENT.password=admin - -# Appender config to CARBON_TRACE_LOGFILE -log4j.appender.CARBON_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.CARBON_TRACE_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon-trace-messages${instance.log}.log -log4j.appender.CARBON_TRACE_LOGFILE.Append=true -log4j.appender.CARBON_TRACE_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -log4j.appender.CARBON_TRACE_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m {%c}%n -log4j.appender.CARBON_TRACE_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] -log4j.appender.CARBON_TRACE_LOGFILE.threshold=TRACE -log4j.additivity.trace.messages=false - -# Appender config to AUDIT_LOGFILE -log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log -log4j.appender.AUDIT_LOGFILE.Append=true -log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p - %x %m %n -log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] -log4j.appender.AUDIT_LOGFILE.threshold=INFO -log4j.additivity.AUDIT_LOG=false - -# Appender config to send Atomikos transaction logs to new log file tm.out. -log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender -log4j.appender.ATOMIKOS.File = repository/logs/tm.out -log4j.appender.ATOMIKOS.Append = true -log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout -log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n - -# This file is used to override the default logger settings, and is used to remove unwanted logs from Shindig appearing on the console. - -# Specification of Handler used by Console Logger -handlers=java.util.logging.ConsoleHandler - -# Replacing default INFO level with SEVERE -java.util.logging.ConsoleHandler.level=SEVERE
