Author: cwiklik
Date: Fri Feb 14 21:15:28 2014
New Revision: 1568521
URL: http://svn.apache.org/r1568521
Log:
UIMA-3618 Added support for more logging
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
uima/uima-as/trunk/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java?rev=1568521&r1=1568520&r2=1568521&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java
Fri Feb 14 21:15:28 2014
@@ -583,7 +583,21 @@ public class JmsInputChannel implements
long idleTime = 0;
boolean doCheckpoint = false;
-
+ try {
+ String workId="";
+ if ( (workId = aMessage.getStringProperty("DuccWorkId") ) != null ) {
+ if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
+ UIMAFramework.getLogger(CLASS_NAME).logrb(
+ Level.INFO,
+ CLASS_NAME.getName(),
+ "onMessage",
+ JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
+ "UIMAJMS_recvd_new_message__INFO",
+ new Object[] {workId});
+ }
+ }
+ } catch (JMSException e1) {
+ }
String eN = endpointName;
if (getController() != null) {
eN = getController().getComponentName();
@@ -604,6 +618,26 @@ public class JmsInputChannel implements
casRefId = "CasReferenceId Not In Message";
} else {
casRefId = aMessage.getStringProperty(AsynchAEMessage.CasReference);
+
+ try {
+ String workId="";
+ if ( (workId = aMessage.getStringProperty("UimaAsCasTracking") ) !=
null ) {
+ System.out.println("Got UimaAsCasTracking property");
+ if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
+ UIMAFramework.getLogger(CLASS_NAME).logrb(
+ Level.INFO,
+ CLASS_NAME.getName(),
+ "onMessage",
+ JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
+ "UIMAJMS_recvd_new_message__INFO",
+ new Object[] {casRefId});
+ }
+ }
+ } catch (JMSException e1) {
+ }
+
+
+
}
if (validMessage(aMessage)) {
command = decodeIntToString(AsynchAEMessage.Command, aMessage
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java?rev=1568521&r1=1568520&r2=1568521&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
Fri Feb 14 21:15:28 2014
@@ -845,6 +845,19 @@ public class JmsOutputChannel implements
if ( !endpointConnection.send(tm, 0, false,
notifyOnJmsException) && notifyOnJmsException ) {
throw new JMSException("JMS Send Failed. Check UIMA Log
For Details.");
}
+ if ( aCasReferenceId != null && aCommand ==
AsynchAEMessage.ServiceInfo) {
+ if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
+ UIMAFramework.getLogger(CLASS_NAME).logrb(
+ Level.INFO,
+ CLASS_NAME.getName(),
+ "sendReply",
+ JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
+ "UIMAJMS_sent_ack_message__INFO",
+ new Object[] {aCasReferenceId});
+ }
+ }
+
+
addIdleTime(tm);
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINE))
{
UIMAFramework.getLogger(CLASS_NAME).logrb(
Modified:
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java?rev=1568521&r1=1568520&r2=1568521&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
(original)
+++
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
Fri Feb 14 21:15:28 2014
@@ -319,7 +319,12 @@ public abstract class BaseMessageSender
pm.get(AsynchAEMessage.CasReference));
if (cacheEntry != null) {
CAS cas = cacheEntry.getCAS();
-
+ // enable logging
+ if (System.getProperty("UimaAsCasTracking") != null) {
+ message.setStringProperty("UimaAsCasTracking", "enable");
+ System.out.println("Added
UimaAsCasTracking property <<<<<<<<<<<<<<<");
+ }
+
// Use Process Timeout value for the time-to-live property
in the
// outgoing JMS message. When this time is exceeded
// while the message sits in a queue, the JMS Server will
remove it from
@@ -361,6 +366,8 @@ public abstract class BaseMessageSender
// start timers
if( casProcessRequest ) {
CAS cas = cacheEntry.getCAS();
+
+
// Add the cas to a list of CASes pending reply. Also start the
timer if necessary
engine.serviceDelegate.addCasToOutstandingList(cacheEntry.getCasReferenceId(),
cas.hashCode(), engine.timerPerCAS); // true=timer per cas
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINE))
{
Modified:
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java?rev=1568521&r1=1568520&r2=1568521&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
(original)
+++
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
Fri Feb 14 21:15:28 2014
@@ -1311,19 +1311,21 @@ public abstract class BaseUIMAAsynchrono
String nodeIP =
message.getStringProperty(AsynchAEMessage.ServerIP);
String pid =
message.getStringProperty(AsynchAEMessage.UimaASProcessPID);
if ( casReferenceId != null && nodeIP != null && pid != null) {
- if
(UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINE)) {
+ if (System.getProperty("UimaAsCasTracking") !=
null) {
+ if
(UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
UIMAFramework.getLogger(CLASS_NAME).logrb(
- Level.FINE,
+ Level.INFO,
CLASS_NAME.getName(),
"handleServiceInfo",
JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
- "UIMAJMS_calling_onBeforeProcessCAS_FINE",
+ "UIMAJMS_calling_onBeforeProcessCAS_INFO",
new Object[] {
- casReferenceId,
-
String.valueOf(casCachedRequest.getCAS().hashCode())
+ casReferenceId
+
});
}
- onBeforeProcessCAS(status,nodeIP, pid);
+ }
+ onBeforeProcessCAS(status,nodeIP, pid);
if
(UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINE)) {
UIMAFramework.getLogger(CLASS_NAME).logrb(
Level.FINE,
Modified:
uima/uima-as/trunk/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties?rev=1568521&r1=1568520&r2=1568521&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties
(original)
+++
uima/uima-as/trunk/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties
Fri Feb 14 21:15:28 2014
@@ -219,7 +219,7 @@ UIMAJMS_cas_dispatched__INFO= \t>>>>>>>
UIMAJMS_cas_reply_rcvd_FINE = \t<<<<<<< UIMA AS Client Received Reply For
CAS:{0} Hashcode:{1}
UIMAJMS_cas_added_to_pending_FINE = UIMA AS Dispatch Thread Added CAS:{0}
Hashcode:{1} To Outstanding List. Current List:\n\n{2}\n\n
UIMAJMS_cas_submitting_FINE=UIMA AS sendAndReceive Received CAS:{0}
HashCode:{1} For Processing - Forwarding to sendCAS() on Thread:{2}
-UIMAJMS_calling_onBeforeProcessCAS_FINE = UIMA AS Client Calling
onBeforeMessageProcess For CAS:{0} Hashcode:{1}
+UIMAJMS_calling_onBeforeProcessCAS_INFO = < client recvd ACK for CAS RefId:{0}
calling onBeforeMessageProcess
UIMAJMS_completed_onBeforeProcessCAS_FINE = UIMA AS Client Completed
onBeforeMessageProcess For CAS:{0} Hashcode:{1}
UIMAJMS_skipping_onBeforeProcessCAS_INFO= UIMA AS Client Not Calling
onBeforeMessageProcess For CAS:{0} Hashcode:{1}. Invalid state: Node IP: {2}
PID: {3}
UIMAJMS_listener_shutdown__INFO = +++++++++++++++ Controller: {0} UIMA AS
Listener With Selector {1} shutdown() completed
@@ -241,4 +241,5 @@ UIMAJMS_session_open__FINE=Service: {0}
UIMAJMS_invalid_broker_url__WARNING=Unexpected State - the Broker URL is NULL
UIMAJMS_shared_connections__INFO=Shared Connection: {0}
UIMAJMS_retrying_jms_connection__WARNING=Connection Invalid - Retrying
Connection to Broker:{0} Every 5 Seconds
-
+UIMAJMS_recvd_new_message__INFO = > service recvd CAS RefId: {0}
+UIMAJMS_sent_ack_message__INFO = < service sent ACK for CAS RefId: {0}
