You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/11/24 02:30:10 UTC
svn commit: r720091 [1/2] - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/
core/src/main/java/org/apache/synapse/mediators/
core/src/main/java/org/apache/synapse/mediators/base/
core/src/main/java/org/apache/synapse/mediators/bu...
Author: veithen
Date: Sun Nov 23 17:30:09 2008
New Revision: 720091
URL: http://svn.apache.org/viewvc?rev=720091&view=rev
Log:
SYNAPSE-374:
* All core and extension mediators have been updated to use the SynapseLog interface.
* Old logging methods in AbstractMediator have been deprecated.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseLog.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseLog.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseLog.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseLog.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseLog.java Sun Nov 23 17:30:09 2008
@@ -81,6 +81,24 @@
void traceTrace(Object msg);
/**
+ * Log an audit message.
+ * In mediators this method should be used to replace
+ * {@link AbstractMediator#auditLog(String, MessageContext)}.
+ *
+ * @param msg the message to be logged
+ */
+ void auditLog(Object msg);
+
+ /**
+ * Log a warning message.
+ * In mediators this method should be used to replace
+ * {@link AbstractMediator#auditWarn(String, MessageContext)}.
+ *
+ * @param msg the message to be logged
+ */
+ void auditWarn(Object msg);
+
+ /**
* Log a message at level 'error'.
*
* @param msg the message to be logged
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java Sun Nov 23 17:30:09 2008
@@ -22,6 +22,7 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.axis2.context.ConfigurationContext;
@@ -48,8 +49,9 @@
int myEffectiveTraceState = synCtx.getTracingState();
try {
- if (isTraceOrDebugOn(isTraceOn(synCtx))) {
- traceOrDebug(isTraceOn(synCtx), "Sequence <" + getType() + "> :: mediate()");
+ SynapseLog synLog = getLog(synCtx);
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Sequence <" + getType() + "> :: mediate()");
}
for (Mediator mediator : mediators) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java Sun Nov 23 17:30:09 2008
@@ -128,6 +128,7 @@
* @param msgCtx the current message
* @return true if tracing should be performed
*/
+ @Deprecated
protected boolean isTraceOn(MessageContext msgCtx) {
return
(traceState == SynapseConstants.TRACING_ON) ||
@@ -140,6 +141,7 @@
* @param isTraceOn is tracing known to be on?
* @return true, if either tracing or debug logging is on
*/
+ @Deprecated
protected boolean isTraceOrDebugOn(boolean isTraceOn) {
return isTraceOn || log.isDebugEnabled();
}
@@ -149,6 +151,7 @@
* @param traceOn is runtime trace on for this message?
* @param msg the message to log/trace
*/
+ @Deprecated
protected void traceOrDebug(boolean traceOn, String msg) {
if (traceOn) {
trace.info(msg);
@@ -163,6 +166,7 @@
* @param traceOn is runtime trace on for this message?
* @param msg the message to log/trace
*/
+ @Deprecated
protected void traceOrDebugWarn(boolean traceOn, String msg) {
if (traceOn) {
trace.warn(msg);
@@ -178,6 +182,7 @@
* @param msg the log message
* @param msgContext the message context
*/
+ @Deprecated
protected void auditLog(String msg, MessageContext msgContext) {
log.info(msg);
if (msgContext.getServiceLog() != null) {
@@ -210,6 +215,7 @@
* @param msg the message to log
* @param msgContext message context
*/
+ @Deprecated
protected void auditWarn(String msg, MessageContext msgContext) {
log.warn(msg);
if (msgContext.getServiceLog() != null) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java Sun Nov 23 17:30:09 2008
@@ -91,6 +91,32 @@
}
/**
+ * Log a message at level INFO to all available/enabled logs.
+ */
+ public void auditLog(Object msg) {
+ defaultLog.info(msg);
+ if (synCtx.getServiceLog() != null) {
+ synCtx.getServiceLog().info(msg);
+ }
+ if (traceOn) {
+ traceLog.info(msg);
+ }
+ }
+
+ /**
+ * Log a message at level WARN to all available/enabled logs.
+ */
+ public void auditWarn(Object msg) {
+ defaultLog.warn(msg);
+ if (synCtx.getServiceLog() != null) {
+ synCtx.getServiceLog().warn(msg);
+ }
+ if (traceOn) {
+ traceLog.warn(msg);
+ }
+ }
+
+ /**
* Log a message at level ERROR to the default log and to the trace, if trace is enabled.
*/
public void error(Object msg) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java Sun Nov 23 17:30:09 2008
@@ -21,6 +21,7 @@
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.synapse.mediators.MediatorFaultHandler;
@@ -65,19 +66,18 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
if (isStatisticsEnable()) {
StatisticsReporter.collect(synCtx, this);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Sequence "
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Sequence "
+ (name == null ? (key == null ? "<anonymous" : "key=<" + key) : "<" + name) + ">");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -96,15 +96,15 @@
errorHandlerMediator = synCtx.getSequence(errorHandler);
if (errorHandlerMediator != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Setting the onError handler : " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Setting the onError handler : " +
errorHandler + " for the sequence : " + name);
}
synCtx.pushFaultHandler(
new MediatorFaultHandler(errorHandlerMediator));
} else {
- auditWarn("onError handler : " + errorHandler + " for sequence : " +
- name + " cannot be found", synCtx);
+ synLog.auditWarn("onError handler : " + errorHandler + " for sequence : " +
+ name + " cannot be found");
}
}
@@ -125,12 +125,12 @@
}
}
- if (traceOrDebugOn) {
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceOrDebugEnabled()) {
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
- traceOrDebug(traceOn,
+ synLog.traceOrDebug(
"End : Sequence <" + (name == null ? "anonymous" : name) + ">");
}
@@ -150,14 +150,14 @@
handleException("Sequence named " + key + " cannot be found", synCtx);
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Executing with key " + key);
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Executing with key " + key);
}
boolean result = m.mediate(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Sequence key=<" + key + ">");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("End : Sequence key=<" + key + ">");
}
return result;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java Sun Nov 23 17:30:09 2008
@@ -21,6 +21,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.mediators.AbstractListMediator;
/**
@@ -42,24 +43,23 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Mediation using '" + SynapseConstants.MAIN_SEQUENCE_KEY +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Mediation using '" + SynapseConstants.MAIN_SEQUENCE_KEY +
"' sequence Message is a : " + (synCtx.isResponse() ? "response" : "request"));
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
boolean result = super.mediate(synCtx);
- if (traceOrDebugOn) {
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceOrDebugEnabled()) {
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
- traceOrDebug(traceOn, "End : Mediation using '" +
+ synLog.traceOrDebug("End : Mediation using '" +
SynapseConstants.MAIN_SEQUENCE_KEY + "' sequence");
}
return result;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java Sun Nov 23 17:30:09 2008
@@ -27,6 +27,7 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.core.axis2.Axis2Sender;
@@ -88,15 +89,13 @@
public boolean mediate(MessageContext synCtx) {
- // tracing and debuggin related mediation initiation
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Cache mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Cache mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -109,10 +108,8 @@
} catch (XMLStreamException e) {
handleException("Error in checking the message size", e, synCtx);
} catch (SynapseException syne) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Message size exceeds the upper bound for caching, " +
+ synLog.traceOrDebug("Message size exceeds the upper bound for caching, " +
"request will not be cached");
- }
return true;
}
}
@@ -125,9 +122,9 @@
return false; // never executes.. but keeps IDE happy
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn,
- "Looking up cache at scope : " + scope + " with ID : " + cacheManagerKey);
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Looking up cache at scope : " + scope + " with ID : "
+ + cacheManagerKey);
}
// look up cache
@@ -143,9 +140,7 @@
cacheManager = (CacheManager) prop;
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Creating/recreating the cache object");
- }
+ synLog.traceOrDebug("Creating/recreating the cache object");
cacheManager = new CacheManager();
cfgCtx.setProperty(cacheManagerKey, cacheManager);
}
@@ -156,22 +151,17 @@
try {
if (synCtx.isResponse()) {
- processResponseMessage(synCtx, cfgCtx, traceOrDebugOn, traceOn, cacheManager);
+ processResponseMessage(synCtx, cfgCtx, synLog, cacheManager);
} else {
- result = processRequestMessage(
- synCtx, cfgCtx, traceOrDebugOn, traceOn, cacheManager);
+ result = processRequestMessage(synCtx, cfgCtx, synLog, cacheManager);
}
} catch (ClusteringFault clusteringFault) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Unable to replicate Cache mediator state among the cluster");
- }
+ synLog.traceOrDebug("Unable to replicate Cache mediator state among the cluster");
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Cache mediator");
- }
+ synLog.traceOrDebug("End : Cache mediator");
return result;
}
@@ -180,15 +170,14 @@
* Process a response message through this cache mediator. This finds the Cache used, and
* updates it for the corresponding request hash
*
- * @param traceOrDebugOn is trace or debug logging on?
- * @param traceOn is tracing on?
+ * @param synLog the Synapse log to use
* @param synCtx the current message (response)
* @param cfgCtx the abstract context in which the cache will be kept
* @param cacheManager the cache manager
* @throws ClusteringFault is there is an error in replicating the cfgCtx
*/
private void processResponseMessage(MessageContext synCtx, ConfigurationContext cfgCtx,
- boolean traceOrDebugOn, boolean traceOn, CacheManager cacheManager) throws ClusteringFault {
+ SynapseLog synLog, CacheManager cacheManager) throws ClusteringFault {
if (!collector) {
handleException("Response messages cannot be handled in a non collector cache", synCtx);
@@ -197,16 +186,16 @@
String requestHash = (String) synCtx.getProperty(CachingConstants.REQUEST_HASH);
if (requestHash != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Storing the response message into the cache at scope : " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Storing the response message into the cache at scope : " +
scope + " with ID : " + cacheManagerKey + " for request hash : " + requestHash);
}
CachedObject cachedObj = cacheManager.getResponseForKey(requestHash, cfgCtx);
if (cachedObj != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Storing the response for the message with ID : " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Storing the response for the message with ID : " +
synCtx.getMessageID() + " with request hash ID : " +
cachedObj.getRequestHash() + " in the cache : " + cacheManagerKey);
}
@@ -234,13 +223,13 @@
cfgCtx.setProperty(cacheManagerKey, cacheManager);
Replicator.replicate(cfgCtx, new String[]{cacheManagerKey});
} else {
- auditWarn("A response message without a valid mapping to the " +
- "request hash found. Unable to store the response in cache", synCtx);
+ synLog.auditWarn("A response message without a valid mapping to the " +
+ "request hash found. Unable to store the response in cache");
}
} else {
- auditWarn("A response message without a mapping to the " +
- "request hash found. Unable to store the response in cache", synCtx);
+ synLog.auditWarn("A response message without a mapping to the " +
+ "request hash found. Unable to store the response in cache");
}
}
@@ -251,14 +240,13 @@
*
* @param synCtx incoming request message
* @param cfgCtx the AbstractContext in which the cache will be kept
- * @param traceOrDebugOn is tracing or debug logging on?
- * @param traceOn is tracing on?
+ * @param synLog the Synapse log to use
* @param cacheManager the cache manager
* @return should this mediator terminate further processing?
* @throws ClusteringFault if there is an error in replicating the cfgCtx
*/
private boolean processRequestMessage(MessageContext synCtx, ConfigurationContext cfgCtx,
- boolean traceOrDebugOn, boolean traceOn, CacheManager cacheManager) throws ClusteringFault {
+ SynapseLog synLog, CacheManager cacheManager) throws ClusteringFault {
if (collector) {
handleException("Request messages cannot be handled in a collector cache", synCtx);
@@ -273,8 +261,8 @@
handleException("Error in calculating the hash value of the request", e, synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Generated request hash : " + requestHash);
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Generated request hash : " + requestHash);
}
if (cacheManager.containsKey(requestHash) &&
@@ -286,8 +274,8 @@
if (!cachedObj.isExpired() && cachedObj.getResponseEnvelope() != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Cache-hit for message ID : " + synCtx.getMessageID());
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Cache-hit for message ID : " + synCtx.getMessageID());
}
// mark as a response and replace envelope from cache
@@ -317,24 +305,22 @@
// take specified action on cache hit
if (onCacheHitSequence != null) {
// if there is an onCacheHit use that for the mediation
- if (traceOrDebugOn) {
- traceOrDebug(traceOn,
- "Delegating message to the onCachingHit " + "Anonymous sequence");
- }
+ synLog.traceOrDebug("Delegating message to the onCachingHit "
+ + "Anonymous sequence");
onCacheHitSequence.mediate(synCtx);
} else if (onCacheHitRef != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Delegating message to the onCachingHit " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Delegating message to the onCachingHit " +
"sequence : " + onCacheHitRef);
}
synCtx.getSequence(onCacheHitRef).mediate(synCtx);
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Request message " + synCtx.getMessageID() +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Request message " + synCtx.getMessageID() +
" was served from the cache : " + cacheManagerKey);
}
// send the response back if there is not onCacheHit is specified
@@ -348,10 +334,7 @@
// cache exists, but has expired...
cachedObj.expire();
cachedObj.setTimeout(timeout);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn,
- "Existing cached response has expired. Reset cache element");
- }
+ synLog.traceOrDebug("Existing cached response has expired. Reset cache element");
cfgCtx.setProperty(cacheManagerKey, cacheManager);
Replicator.replicate(cfgCtx, new String[]{cacheManagerKey});
@@ -363,9 +346,7 @@
if (cacheManager.getCacheKeys().size() == inMemoryCacheSize) {
cacheManager.removeExpiredResponses(cfgCtx);
if (cacheManager.getCacheKeys().size() == inMemoryCacheSize) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "In-memory cache is full. Unable to cache");
- }
+ synLog.traceOrDebug("In-memory cache is full. Unable to cache");
} else {
storeRequestToCache(cfgCtx, requestHash, cacheManager);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java Sun Nov 23 17:30:09 2008
@@ -34,6 +34,7 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
@@ -66,14 +67,13 @@
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Callout mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Callout mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -100,20 +100,18 @@
sc.setOptions(options);
OMElement request = getRequestPayload(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "About to invoke service : " + serviceURL + (action != null ?
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("About to invoke service : " + serviceURL + (action != null ?
" with action : " + action : ""));
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Request message payload : " + request);
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Request message payload : " + request);
}
}
OMElement result = sc.sendReceive(request);
- if (traceOrDebugOn) {
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Response payload received : " + result);
- }
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Response payload received : " + result);
}
if (result != null) {
@@ -137,9 +135,7 @@
synCtx.setProperty(targetKey, result);
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Service returned a null response");
- }
+ synLog.traceOrDebug("Service returned a null response");
}
} catch (Exception e) {
@@ -147,9 +143,7 @@
(action != null ? " with action : " + action : ""), e, synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Callout mediator");
- }
+ synLog.traceOrDebug("End : Callout mediator");
return true;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java Sun Nov 23 17:30:09 2008
@@ -20,6 +20,7 @@
package org.apache.synapse.mediators.builtin;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.mediators.AbstractMediator;
/**
@@ -35,20 +36,17 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Drop mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Drop mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Drop mediator");
- }
+ synLog.traceOrDebug("End : Drop mediator");
synCtx.setTo(null);
return false;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java Sun Nov 23 17:30:09 2008
@@ -22,10 +22,8 @@
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.MediatorProperty;
@@ -69,30 +67,19 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Log mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Log mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
- String logMessage = getLogMessage(synCtx);
- synCtx.getServiceLog().info(logMessage);
+ synLog.auditLog(getLogMessage(synCtx));
- if (log.isInfoEnabled()) {
- log.info(logMessage);
- }
- if (traceOn) {
- trace.info("Log message : " + logMessage);
- }
-
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Log mediator");
- }
+ synLog.traceOrDebug("End : Log mediator");
return true;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java Sun Nov 23 17:30:09 2008
@@ -20,6 +20,7 @@
package org.apache.synapse.mediators.builtin;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
@@ -62,14 +63,13 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Property mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Property mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -77,8 +77,8 @@
String resultValue = (value != null ? value : expression.stringValueOf(synCtx));
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Setting property : " + name + " at scope : " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Setting property : " + name + " at scope : " +
(scope == null ? "default" : scope) + " to : " + resultValue + " (i.e. " +
(value != null ? "constant : " + value :
"result of expression : " + expression) + ")");
@@ -127,8 +127,8 @@
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Removing property : " + name +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Removing property : " + name +
" (scope:" + (scope == null ? "default" : scope) + ")");
}
@@ -161,15 +161,11 @@
Map headersMap = (HashMap) headers;
headersMap.remove(name);
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "No transport headers found for the message");
- }
+ synLog.traceOrDebug("No transport headers found for the message");
}
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Property mediator");
- }
+ synLog.traceOrDebug("End : Property mediator");
return true;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java Sun Nov 23 17:30:09 2008
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
@@ -51,21 +52,18 @@
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : RMSequence mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : RMSequence mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
if (!(synCtx instanceof Axis2MessageContext)) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Only axis2 message contexts are supported");
- }
+ synLog.traceOrDebug("Only axis2 message contexts are supported");
} else {
Axis2MessageContext axis2MessageCtx = (Axis2MessageContext) synCtx;
@@ -89,8 +87,8 @@
orgMessageCtx.getOptions().setProperty(
SynapseConstants.MERCURY_LAST_MESSAGE, "true");
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Using WS-RM version " + version +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Using WS-RM version " + version +
" and a single message sequence : " + sequenceID +
" and offering sequence : " + offeredSeqID);
}
@@ -117,17 +115,15 @@
sequenceMap.remove(correlationValue);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Correlation value : " + correlationValue +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Correlation value : " + correlationValue +
" last message = " + lastMessage + " using sequence : " + sequenceID +
(offeredSeqID != null ? " offering sequence : " + offeredSeqID : ""));
}
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : RMSequence mediator");
- }
+ synLog.traceOrDebug("End : RMSequence mediator");
return true;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java Sun Nov 23 17:30:09 2008
@@ -21,10 +21,10 @@
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.dbcp.datasources.PerUserPoolDataSource;
-import org.apache.commons.logging.Log;
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.commons.util.datasource.DBPoolView;
import org.apache.synapse.config.xml.AbstractDBMediatorFactory;
import org.apache.synapse.core.SynapseEnvironment;
@@ -87,14 +87,13 @@
public boolean mediate(MessageContext synCtx) {
String name = (this instanceof DBLookupMediator ? "DBLookup" : "DBReport");
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : " + name + " mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : " + name + " mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -102,8 +101,8 @@
processStatement((Statement) iter.next(), synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : " + name + " mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("End : " + name + " mediator");
}
return true;
}
@@ -165,13 +164,10 @@
*/
protected PreparedStatement getPreparedStatement(Statement stmnt, MessageContext msgCtx) throws SQLException {
- boolean traceOn = isTraceOn(msgCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(msgCtx);
- Log serviceLog = msgCtx.getServiceLog();
-
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Getting a connection from DataSource " + getDSName() +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Getting a connection from DataSource " + getDSName() +
" and preparing statement : " + stmnt.getRawStatement());
}
@@ -197,12 +193,12 @@
dbPoolView.updateConnectionUsage(connectionId);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "[ DB Connection : " + con + " ]");
- traceOrDebug(traceOn, "[ DB Connection instance identifier : " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("[ DB Connection : " + con + " ]");
+ synLog.traceOrDebug("[ DB Connection instance identifier : " +
connectionId + " ]");
- traceOrDebug(traceOn, "[ Number of Active Connection : " + numActive + " ]");
- traceOrDebug(traceOn, "[ Number of Idle Connection : " + numIdle + " ]");
+ synLog.traceOrDebug("[ Number of Active Connection : " + numActive + " ]");
+ synLog.traceOrDebug("[ Number of Idle Connection : " + numIdle + " ]");
}
}
@@ -218,8 +214,8 @@
String value = (param.getPropertyName() != null ?
param.getPropertyName() : param.getXpath().stringValueOf(msgCtx));
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Setting as parameter : " + column + " value : " + value +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Setting as parameter : " + column + " value : " + value +
" as JDBC Type : " + param.getType() + "(see java.sql.Types for valid types)");
}
@@ -292,8 +288,8 @@
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Successfully prepared statement : " + stmnt.getRawStatement() +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Successfully prepared statement : " + stmnt.getRawStatement() +
" against DataSource : " + getDSName());
}
return ps;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java Sun Nov 23 17:30:09 2008
@@ -20,6 +20,7 @@
package org.apache.synapse.mediators.db;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -34,8 +35,7 @@
protected void processStatement(Statement stmnt, MessageContext msgCtx) {
- boolean traceOn = isTraceOn(msgCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(msgCtx);
// execute the prepared statement, and extract the first result row and
// set as message context properties, any results that have been specified
@@ -46,8 +46,8 @@
ResultSet rs = ps.executeQuery();
if (rs.next()) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn,
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug(
"Processing the first row returned : " + stmnt.getRawStatement());
}
@@ -66,22 +66,22 @@
}
if (obj != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Column : " + columnStr +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Column : " + columnStr +
" returned value : " + obj +
" Setting this as the message property : " + propName);
}
msgCtx.setProperty(propName, obj.toString());
} else {
- if (traceOrDebugOn) {
- traceOrDebugWarn(traceOn, "Column : " + columnStr +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebugWarn("Column : " + columnStr +
" returned null Skip setting message property : " + propName);
}
}
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Statement : "
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Statement : "
+ stmnt.getRawStatement() + " returned 0 rows");
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java Sun Nov 23 17:30:09 2008
@@ -20,6 +20,7 @@
package org.apache.synapse.mediators.db;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@@ -32,8 +33,7 @@
protected void processStatement(Statement stmnt, MessageContext msgCtx) {
- boolean traceOn = isTraceOn(msgCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(msgCtx);
Connection con = null;
try {
@@ -42,13 +42,13 @@
int count = ps.executeUpdate();
if (count > 0) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn,
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug(
"Inserted " + count + " row/s using statement : " + stmnt.getRawStatement());
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn,
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug(
"No rows were inserted for statement : " + stmnt.getRawStatement());
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java Sun Nov 23 17:30:09 2008
@@ -20,7 +20,7 @@
package org.apache.synapse.mediators.eip.aggregator;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.eip.EIPConstants;
import org.apache.commons.logging.Log;
@@ -38,7 +38,6 @@
public class Aggregate extends TimerTask {
private static final Log log = LogFactory.getLog(Aggregate.class);
- private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
private long timeoutMillis = 0;
/** The time in millis at which this aggregation should be considered as expired */
@@ -99,15 +98,11 @@
/**
* Has this aggregation group completed?
*
- * @param traceOn is tracing on
- * @param traceOrDebugOn is trace or debug on
- * @param trace trace log to be used
- * @param log log to be used
+ * @param synLog the Synapse log to use
*
* @return boolean true if aggregation is complete
*/
- public synchronized boolean isComplete(boolean traceOn, boolean traceOrDebugOn,
- Log trace, Log log) {
+ public synchronized boolean isComplete(SynapseLog synLog) {
if (!completed) {
@@ -123,28 +118,24 @@
EIPConstants.MESSAGE_SEQUENCE_DELEMITER);
int total = Integer.parseInt(msgSequence[1]);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, trace, log, messages.size() +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug(messages.size() +
" messages of " + total + " collected in current aggregation");
}
if (messages.size() >= total) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, trace, log, "Aggregation complete");
- }
+ synLog.traceOrDebug("Aggregation complete");
return true;
}
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, trace, log, "No messages collected in current aggregation");
- }
+ synLog.traceOrDebug("No messages collected in current aggregation");
}
// if the minimum number of messages has been reached, its complete
if (minCount > 0 && messages.size() >= minCount) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, trace, log,
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug(
"Aggregation complete - the minimum : " + minCount
+ " messages has been reached");
}
@@ -152,8 +143,8 @@
}
if (maxCount > 0 && messages.size() >= maxCount) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, trace, log,
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug(
"Aggregation complete - the maximum : " + maxCount
+ " messages has been reached");
}
@@ -163,32 +154,18 @@
// else, has this aggregation reached its timeout?
if (expiryTimeMillis > 0 && System.currentTimeMillis() >= expiryTimeMillis) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, trace, log,
- "Aggregation complete - the aggregation has timed out");
- }
+ synLog.traceOrDebug("Aggregation complete - the aggregation has timed out");
return true;
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, trace, log,
- "Aggregation already completed - this message will not be processed in aggregation");
- }
+ synLog.traceOrDebug(
+ "Aggregation already completed - this message will not be processed in aggregation");
}
return false;
}
- private void traceOrDebug(boolean traceOn, Log trace, Log log, String msg) {
- if (traceOn) {
- trace.info(msg);
- }
- if (log.isDebugEnabled()) {
- log.debug(msg);
- }
- }
-
public long getTimeoutMillis() {
return timeoutMillis;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java Sun Nov 23 17:30:09 2008
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.base.SequenceMediator;
@@ -52,7 +52,6 @@
public class AggregateMediator extends AbstractMediator implements ManagedLifecycle {
private static final Log log = LogFactory.getLog(AggregateMediator.class);
- private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/** The duration as a number of milliseconds for this aggregation to complete */
private long completionTimeoutMillis = 0;
@@ -121,14 +120,13 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Aggregate mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Aggregate mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -155,8 +153,8 @@
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Creating new Aggregator - " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Creating new Aggregator - " +
(completionTimeoutMillis > 0 ? "expires in : "
+ (completionTimeoutMillis / 1000) + "secs" :
"without expiry time"));
@@ -202,8 +200,8 @@
break;
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Creating new Aggregator - " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Creating new Aggregator - " +
(completionTimeoutMillis > 0 ? "expires in : "
+ (completionTimeoutMillis / 1000) + "secs" :
"without expiry time"));
@@ -231,27 +229,22 @@
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Unable to find aggrgation correlation property");
- }
+ synLog.traceOrDebug("Unable to find aggrgation correlation property");
return true;
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn,
- "Unable to find aggrgation correlation XPath or property");
- }
+ synLog.traceOrDebug("Unable to find aggrgation correlation XPath or property");
return true;
}
// if there is an aggregate continue on aggregation
if (aggregate != null) {
boolean collected = aggregate.addMessage(synCtx);
- if (traceOrDebugOn) {
+ if (synLog.isTraceOrDebugEnabled()) {
if (collected) {
- traceOrDebug(traceOn, "Collected a message during aggregation");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Collected message : " + synCtx);
+ synLog.traceOrDebug("Collected a message during aggregation");
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Collected message : " + synCtx);
}
}
}
@@ -259,15 +252,11 @@
// check the completeness of the aggregate and if completed aggregate the messages
// if not completed return false and block the message sequence till it completes
- if (aggregate.isComplete(traceOn, traceOrDebugOn, trace, log)) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Aggregation completed - invoking onComplete");
- }
+ if (aggregate.isComplete(synLog)) {
+ synLog.traceOrDebug("Aggregation completed - invoking onComplete");
completeAggregate(aggregate);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Aggregate mediator");
- }
+ synLog.traceOrDebug("End : Aggregate mediator");
return true;
} else {
aggregate.releaseLock();
@@ -277,9 +266,7 @@
// if the aggregation correlation cannot be found then continue the message on the
// normal path by returning true
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Unable to find an aggregate for this message - skip");
- }
+ synLog.traceOrDebug("Unable to find an aggregate for this message - skip");
return true;
}
@@ -287,9 +274,7 @@
handleException("Unable to execute the XPATH over the message", e, synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Aggregate mediator");
- }
+ synLog.traceOrDebug("End : Aggregate mediator");
return false;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java Sun Nov 23 17:30:09 2008
@@ -21,6 +21,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.ManagedLifecycle;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.core.SynapseEnvironment;
@@ -64,14 +65,13 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Clone mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Clone mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -80,8 +80,8 @@
Iterator<Target> iter = targets.iterator();
int i = 0;
while (iter.hasNext()) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Submitting " + (i+1) + " of " + targets.size() +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Submitting " + (i+1) + " of " + targets.size() +
" messages for processing in parallel");
}
@@ -97,9 +97,7 @@
}
// finalize tracing and debugging
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Clone mediator");
- }
+ synLog.traceOrDebug("End : Clone mediator");
// if continue parent is true mediators after the clone will be called for the further
// mediation of the message which is subjected for clonning (parent message)
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java Sun Nov 23 17:30:09 2008
@@ -28,6 +28,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
@@ -80,14 +81,13 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Iterate mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Iterate mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -101,8 +101,8 @@
// this call will also detach all the iteration elements
List splitElements = EIPUtils.getDetachedMatchingElements(envelope, expression);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Splitting with XPath : " + expression + " resulted in " +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Splitting with XPath : " + expression + " resulted in " +
splitElements.size() + " elements");
}
@@ -125,8 +125,8 @@
+ expression + " - result not an OMNode", synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Submitting " + (msgNumber+1) + " of " + msgNumber +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Submitting " + (msgNumber+1) + " of " + msgNumber +
" messages for processing in parallel");
}
@@ -148,9 +148,7 @@
opCtx.setProperty(Constants.RESPONSE_WRITTEN,"SKIP");
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Iterate mediator");
- }
+ synLog.traceOrDebug("End : Iterate mediator");
// whether to continue mediation on the original message
return continueParent;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediator.java Sun Nov 23 17:30:09 2008
@@ -21,6 +21,7 @@
import org.apache.synapse.Command;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.mediators.annotations.Namespaces;
import org.apache.synapse.mediators.annotations.ReadAndUpdate;
import org.apache.synapse.mediators.annotations.ReadFromMessage;
@@ -45,19 +46,18 @@
@Override
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : POJOCommand mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : POJOCommand mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Creating a new instance of POJO class : " + getCommand().getClass());
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Creating a new instance of POJO class : " + getCommand().getClass());
}
Object commandObject = null;
@@ -69,9 +69,7 @@
getCommand().getClass(), e, synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Instance created, setting static and dynamic properties");
- }
+ synLog.traceOrDebug("Instance created, setting static and dynamic properties");
// then set the static/constant properties first
for (Iterator iter = getStaticSetterProperties().keySet().iterator(); iter.hasNext(); ) {
@@ -110,9 +108,7 @@
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "POJO initialized successfully, invoking the execute() method");
- }
+ synLog.traceOrDebug("POJO initialized successfully, invoking the execute() method");
// then call the execute method if the Command interface is implemented
if (commandObject instanceof Command) {
@@ -140,9 +136,7 @@
// TODO: now update the MessageContext from the commandObject
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : POJOCommand mediator");
- }
+ synLog.traceOrDebug("End : POJOCommand mediator");
return true;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java Sun Nov 23 17:30:09 2008
@@ -23,6 +23,7 @@
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
@@ -57,19 +58,18 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Class mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Class mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "invoking : " + mediator.getClass() + ".mediate()");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("invoking : " + mediator.getClass() + ".mediate()");
}
boolean result;
@@ -82,9 +82,7 @@
throw new SynapseException("Error occured in the mediation of the class mediator", e);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : Class mediator");
- }
+ synLog.traceOrDebug("End : Class mediator");
return result;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java Sun Nov 23 17:30:09 2008
@@ -24,6 +24,7 @@
import org.apache.axiom.om.OMNode;
import org.apache.synapse.Command;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.eip.EIPUtils;
import org.apache.synapse.util.xpath.SynapseXPath;
@@ -90,19 +91,18 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : POJOCommand mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : POJOCommand mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Creating a new instance of POJO class : " + command.getClass());
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Creating a new instance of POJO class : " + command.getClass());
}
Object commandObject = null;
@@ -114,9 +114,7 @@
command.getClass(), e, synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Instance created, setting static and dynamic properties");
- }
+ synLog.traceOrDebug("Instance created, setting static and dynamic properties");
// then set the static/constant properties first
for (String name : staticSetterProperties.keySet()) {
@@ -137,9 +135,7 @@
setInstanceProperty(name, value, commandObject, synCtx);
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "POJO initialized successfully, invoking the execute() method");
- }
+ synLog.traceOrDebug("POJO initialized successfully, invoking the execute() method");
// then call the execute method if the Command interface is implemented
if (commandObject instanceof Command) {
@@ -192,8 +188,8 @@
}
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Unable to set the message property " + resultValue
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Unable to set the message property " + resultValue
+ "back to the message : Specified element by the xpath "
+ xpath + " can not be found");
}
@@ -204,9 +200,7 @@
}
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : POJOCommand mediator");
- }
+ synLog.traceOrDebug("End : POJOCommand mediator");
return true;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java Sun Nov 23 17:30:09 2008
@@ -21,6 +21,7 @@
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.synapse.mediators.ListMediator;
@@ -69,14 +70,13 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : Filter mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : Filter mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
@@ -85,8 +85,8 @@
if (thenKey != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, (xpath == null ?
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug((xpath == null ?
"Source : " + source + " against : " + regex.pattern() + " matches" :
"XPath expression : " + xpath + " evaluates to true") +
" - executing then sequence with key : " + thenKey);
@@ -102,8 +102,8 @@
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, (xpath == null ?
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug((xpath == null ?
"Source : " + source + " against : " + regex.pattern() + " matches" :
"XPath expression : " + xpath + " evaluates to true") +
" - executing child mediators");
@@ -116,8 +116,8 @@
if (elseKey != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, (xpath == null ?
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug((xpath == null ?
"Source : " + source + " against : " + regex.pattern() + " does not match" :
"XPath expression : " + xpath + " evaluates to false") +
" - executing the else sequence with key : " + elseKey);
@@ -134,8 +134,8 @@
} else if (elseMediator != null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, (xpath == null ?
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug((xpath == null ?
"Source : " + source + " against : " + regex.pattern() + " does not match" :
"XPath expression : " + xpath + " evaluates to false") +
" - executing the else path child mediators");
@@ -144,8 +144,8 @@
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, (xpath == null ?
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug((xpath == null ?
"Source : " + source + " against : " + regex.pattern() + " does not match" :
"XPath expression : " + xpath + " evaluates to false and no else path") +
" - skipping child mediators");
@@ -154,9 +154,7 @@
}
}
- if (traceOrDebugOn) {
- trace.trace("End : Filter mediator ");
- }
+ synLog.traceOrDebug("End : Filter mediator ");
return result;
}
@@ -171,8 +169,7 @@
*/
public boolean test(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
if (xpath != null) {
try {
@@ -184,15 +181,15 @@
} else if (source != null && regex != null) {
String sourceString = source.stringValueOf(synCtx);
if (sourceString == null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Source String : " + source + " evaluates to null");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Source String : " + source + " evaluates to null");
}
return false;
}
Matcher matcher = regex.matcher(sourceString);
if (matcher == null) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Regex pattren matcher for : " + regex.pattern() +
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Regex pattern matcher for : " + regex.pattern() +
"against source : " + sourceString + " is null");
}
return false;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java?rev=720091&r1=720090&r2=720091&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java Sun Nov 23 17:30:09 2008
@@ -23,6 +23,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.mediators.AbstractListMediator;
/**
@@ -41,33 +42,26 @@
*/
public boolean mediate(MessageContext synCtx) {
- boolean traceOn = isTraceOn(synCtx);
- boolean traceOrDebugOn = isTraceOrDebugOn(traceOn);
+ SynapseLog synLog = getLog(synCtx);
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Start : In mediator");
+ if (synLog.isTraceOrDebugEnabled()) {
+ synLog.traceOrDebug("Start : In mediator");
- if (traceOn && trace.isTraceEnabled()) {
- trace.trace("Message : " + synCtx.getEnvelope());
+ if (synLog.isTraceTraceEnabled()) {
+ synLog.traceTrace("Message : " + synCtx.getEnvelope());
}
}
boolean result = true;
if (test(synCtx)) {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Current message is incoming - executing child mediators");
- }
+ synLog.traceOrDebug("Current message is incoming - executing child mediators");
result = super.mediate(synCtx);
} else {
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "Current message is a response - skipping child mediators");
- }
+ synLog.traceOrDebug("Current message is a response - skipping child mediators");
}
- if (traceOrDebugOn) {
- traceOrDebug(traceOn, "End : In mediator");
- }
+ synLog.traceOrDebug("End : In mediator");
return result;
}