You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by me...@apache.org on 2015/02/12 19:23:30 UTC
[1/2] stratos git commit: JCA - removing some unnecessary log
statements
Repository: stratos
Updated Branches:
refs/heads/master 5675793f9 -> be39424a6
JCA - removing some unnecessary log statements
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cf3d8455
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cf3d8455
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cf3d8455
Branch: refs/heads/master
Commit: cf3d84553d2b4526a9993a2d507deae496f77ef0
Parents: 4bc84f5
Author: Martin Eppel <me...@cisco..com>
Authored: Thu Feb 12 10:18:31 2015 -0800
Committer: Martin Eppel <me...@cisco..com>
Committed: Thu Feb 12 10:18:31 2015 -0800
----------------------------------------------------------------------
.../apache/stratos/cartridge/agent/CartridgeAgent.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/cf3d8455/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
index 946f2f9..a937c6c 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
@@ -83,11 +83,8 @@ public class CartridgeAgent implements Runnable {
eventListenerns = new CartridgeAgentEventListeners();
- log.debug("MArtin: before validating system properties");
-
validateRequiredSystemProperties();
- log.debug("MArtin: after validating system properties");
if (log.isInfoEnabled()) {
log.info("Cartridge agent validated system properties done");
@@ -296,10 +293,8 @@ public class CartridgeAgent implements Runnable {
}
protected void validateRequiredSystemProperties() {
- log.debug("MArtin: validating system properties");
String jndiPropertiesDir = System.getProperty(CartridgeAgentConstants.JNDI_PROPERTIES_DIR);
- log.debug("MArtin: validating system properties 0b: " + jndiPropertiesDir);
if (StringUtils.isBlank(jndiPropertiesDir)) {
if (log.isErrorEnabled()) {
log.error(String.format("System property not found: %s", CartridgeAgentConstants.JNDI_PROPERTIES_DIR));
@@ -307,10 +302,7 @@ public class CartridgeAgent implements Runnable {
return;
}
- log.debug("MArtin: validating system properties 1");
-
String payloadPath = System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH);
- log.debug("MArtin: validating system properties 1b: " + payloadPath);
if (StringUtils.isBlank(payloadPath)) {
if (log.isErrorEnabled()) {
log.error(String.format("System property not found: %s", CartridgeAgentConstants.PARAM_FILE_PATH));
@@ -318,18 +310,13 @@ public class CartridgeAgent implements Runnable {
return;
}
- log.debug("MArtin: validating system properties 2");
-
String extensionsDir = System.getProperty(CartridgeAgentConstants.EXTENSIONS_DIR);
- log.debug("MArtin: validating system properties 2b: " + extensionsDir);
if (StringUtils.isBlank(extensionsDir)) {
if (log.isWarnEnabled()) {
log.warn(String.format("System property not found: %s", CartridgeAgentConstants.EXTENSIONS_DIR));
}
}
-
- log.debug("MArtin: validating system properties 3");
}
private static void publishLogs(LogPublisherManager logPublisherManager) {
[2/2] stratos git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos removing some unnecessary log
statements from JCA
Posted by me...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
removing some unnecessary log statements from JCA
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/be39424a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/be39424a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/be39424a
Branch: refs/heads/master
Commit: be39424a6a0ba35b25cfcaa477eb54e0e2ec6e7c
Parents: cf3d845 5675793
Author: Martin Eppel <me...@cisco..com>
Authored: Thu Feb 12 10:21:27 2015 -0800
Committer: Martin Eppel <me...@cisco..com>
Committed: Thu Feb 12 10:21:27 2015 -0800
----------------------------------------------------------------------
.../messaging/broker/connect/RetryTimer.java | 9 ++++++
.../broker/connect/amqp/AmqpTopicPublisher.java | 7 +----
.../connect/amqp/AmqpTopicSubscriber.java | 30 ++++++++++++--------
.../broker/subscribe/EventSubscriber.java | 8 ++++--
4 files changed, 33 insertions(+), 21 deletions(-)
----------------------------------------------------------------------