Author: charith
Date: Mon Feb 21 12:13:31 2011
New Revision: 1072942
URL: http://svn.apache.org/viewvc?rev=1072942&view=rev
Log:
adding logs for the message store and message processor
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/DeadLetterChannelView.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/RedeliveryJob.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java?rev=1072942&r1=1072941&r2=1072942&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java
Mon Feb 21 12:13:31 2011
@@ -54,6 +54,10 @@ public class MessageStoreMediator extend
sequence.mediate(synCtx);
}
}
+
+ if(log.isDebugEnabled()) {
+ log.debug("Message Store mediator storing the message : \n
" + synCtx.getEnvelope());
+ }
messageStore.offer(synCtx);
// with the nio transport, this causes the listener not to
write a 202
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/DeadLetterChannelView.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/DeadLetterChannelView.java?rev=1072942&r1=1072941&r2=1072942&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/DeadLetterChannelView.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/DeadLetterChannelView.java
Mon Feb 21 12:13:31 2011
@@ -18,6 +18,8 @@
*/
package org.apache.synapse.message.processors.dlc;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseArtifact;
@@ -33,35 +35,52 @@ public class DeadLetterChannelView imple
private MessageStore messageStore;
+ private static Log log = LogFactory.getLog(DeadLetterChannelView.class);
public DeadLetterChannelView(MessageStore messageStore) {
- this.messageStore = messageStore;
+ if (messageStore != null) {
+ this.messageStore = messageStore;
+ } else {
+ throw new SynapseException("Error , Can not create Dead Letter
Channel view with null " +
+ "message store");
+ }
}
public void resendAll() {
+ log.info("Manually Resending All messages in the Message Store " +
messageStore.getName());
if (((AbstractMessageStore) messageStore).getLock().tryLock()) {
- int size = messageStore.size();
- for (int i = 0; i < size; i++) {
- MessageContext messageContext = messageStore.poll();
- if (messageContext != null) {
- redeliver(messageContext);
+ try {
+ int size = messageStore.size();
+ for (int i = 0; i < size; i++) {
+ MessageContext messageContext = messageStore.poll();
+ if (messageContext != null) {
+ redeliver(messageContext);
+ }
}
-
+ } finally {
+ ((AbstractMessageStore) messageStore).getLock().unlock();
}
} else {
+ log.info("Message store being used Can't perform resendAll
operation");
throw new SynapseException("Error Message store being used re try
later");
}
}
public void deleteAll() {
+ log.info("Manually deleting all messages in Message store");
if (((AbstractMessageStore) messageStore).getLock().tryLock()) {
- int size = messageStore.size();
- for (int i = 0; i < size; i++) {
- messageStore.poll();
+ try {
+ int size = messageStore.size();
+ for (int i = 0; i < size; i++) {
+ messageStore.poll();
+ }
+ } finally {
+ ((AbstractMessageStore) messageStore).getLock().unlock();
}
} else {
+ log.info("Message store being used Can't perform deleteAll
operation");
throw new SynapseException("Error Message store being used re try
later");
}
}
@@ -79,20 +98,38 @@ public class DeadLetterChannelView imple
}
public void resend(String messageID) {
+ log.info(" Manually re-sending the Message with id " + messageID);
if (((AbstractMessageStore) messageStore).getLock().tryLock()) {
- MessageContext messageContext = messageStore.remove(messageID);
- if (messageContext != null) {
- redeliver(messageContext);
+ try {
+ MessageContext messageContext = messageStore.remove(messageID);
+ if (messageContext != null) {
+ redeliver(messageContext);
+ }
+ } finally {
+ ((AbstractMessageStore) messageStore).getLock().unlock();
}
} else {
+ log.info("Message store being used Can't perform resend operation
for" +
+ " message with id " +messageID);
throw new SynapseException("Error Message store being used re try
later");
}
}
public void delete(String messageID) {
- if (((AbstractMessageStore) messageStore).getLock().tryLock()) {
- messageStore.remove(messageID);
- }
+ log.info(" Manually deleting the Message with id " + messageID);
+
+ if (((AbstractMessageStore) messageStore).getLock().tryLock()) {
+ try {
+ messageStore.remove(messageID);
+ } finally {
+ ((AbstractMessageStore) messageStore).getLock().unlock();
+ }
+ } else {
+ log.info("Message store being used Can't perform delete
operation for" +
+ " message with id " +messageID);
+ throw new SynapseException("Error Message store being used re
try later");
+ }
+
}
public String getEnvelope(String messageID) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/RedeliveryJob.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/RedeliveryJob.java?rev=1072942&r1=1072941&r2=1072942&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/RedeliveryJob.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/dlc/RedeliveryJob.java
Mon Feb 21 12:13:31 2011
@@ -112,6 +112,9 @@ public class RedeliveryJob implements Jo
messageStore.offer(messageContext);
}
} else {
+ log.warn("Replay mediator or endpoint not
specified. You may need to set" +
+ " property " +
DLCConstents.REPLAY_ENDPOINT +" or " +
+ DLCConstents.REPLAY_SEQUENCE);
messageStore.offer(messageContext);
}
@@ -140,6 +143,9 @@ public class RedeliveryJob implements Jo
setFaultHandler(messageContext);
if (endpoint != null && messageContext != null) {
if (endpoint.readyToSend()) {
+ if(log.isDebugEnabled()) {
+ log.debug("Re sending Message via Endpoint " +
endpoint.getName());
+ }
endpoint.send(messageContext);
return true;
} else {
@@ -161,6 +167,10 @@ public class RedeliveryJob implements Jo
static boolean handleSequenceReplay(Mediator mediator, MessageContext
messageContext) {
if (mediator != null && messageContext != null) {
setFaultHandler(messageContext);
+ if(log.isDebugEnabled()) {
+ log.debug("Re sending message via Mediator " +
+
messageContext.getProperty(DLCConstents.REPLAY_SEQUENCE));
+ }
mediator.mediate(messageContext);
return true;
}
@@ -201,7 +211,8 @@ public class RedeliveryJob implements Jo
messageContext.pushFaultHandler(faultHandler);
} else {
log.warn("Error handler " + replayFaultHandler + " Not defined
in the synapse " +
- "configuration");
+ "configuration. You may need to set the property " +
+ DLCConstents.REPLAY_FAULT_HANDLER);
}
}else {
log.warn("No fault handler defined for the replaying Message with
id " +
