Repository: stratos Updated Branches: refs/heads/master 6b89b3d27 -> 9fde67508
Fixing java cartridge agent startup issue found in 4.1.0-rc1 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9fde6750 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9fde6750 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9fde6750 Branch: refs/heads/master Commit: 9fde67508719bdeec8bc10a4e96309d348a5e9ca Parents: 6b89b3d Author: Imesh Gunaratne <[email protected]> Authored: Sun May 24 14:21:36 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun May 24 14:22:26 2015 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/stratos/cartridge/agent/Main.java | 6 ------ .../modules/distribution/src/main/conf/jndi.properties | 9 +++------ .../modules/distribution/src/main/conf/log4j.properties | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9fde6750/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java index 4bb1b89..c4b7d17 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java @@ -52,12 +52,6 @@ public class Main { } }); - // Configure log4j properties - if (log.isDebugEnabled()) { - log.debug("Configuring log4j.properties file path"); - } - PropertyConfigurator.configure(System.getProperty("log4j.configuration")); - // Initialize cartridge agent configuration CartridgeAgentConfiguration.getInstance(); http://git-wip-us.apache.org/repos/asf/stratos/blob/9fde6750/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties b/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties index 2dd9137..21d7420 100644 --- a/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties +++ b/products/cartridge-agent/modules/distribution/src/main/conf/jndi.properties @@ -7,7 +7,7 @@ # "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 +# 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 @@ -16,10 +16,7 @@ # specific language governing permissions and limitations # under the License. # -# This is a generated file and will be overwritten at the next load balancer startup. -# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template -# file for updating other configurations. -# + connectionfactoryName=TopicConnectionFactory -java.naming.provider.url=tcp://localhost:5677 +java.naming.provider.url=tcp://localhost:61616 java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory http://git-wip-us.apache.org/repos/asf/stratos/blob/9fde6750/products/cartridge-agent/modules/distribution/src/main/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/log4j.properties b/products/cartridge-agent/modules/distribution/src/main/conf/log4j.properties index 178aa9f..dd3676b 100644 --- a/products/cartridge-agent/modules/distribution/src/main/conf/log4j.properties +++ b/products/cartridge-agent/modules/distribution/src/main/conf/log4j.properties @@ -25,7 +25,7 @@ log4j.appender.CONSOLE_APPENDER=org.apache.log4j.ConsoleAppender # The standard error log where all the warnings, errors and fatal errors will be logged log4j.appender.FILE_APPENDER=org.apache.log4j.FileAppender -log4j.appender.FILE_APPENDER.File=/var/log/apache-stratos/cartridge-agent.log +log4j.appender.FILE_APPENDER.File=cartridge-agent.log log4j.appender.FILE_APPENDER.layout=org.apache.log4j.PatternLayout log4j.appender.FILE_APPENDER.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n log4j.appender.FILE_APPENDER.threshold=DEBUG
