You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2014/08/07 16:25:55 UTC
svn commit: r1616495 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
Author: cwiklik
Date: Thu Aug 7 14:25:55 2014
New Revision: 1616495
URL: http://svn.apache.org/r1616495
Log:
UIMA-3964 Added stop() to facilitate orderly shutdown of routes
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java?rev=1616495&r1=1616494&r2=1616495&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java Thu Aug 7 14:25:55 2014
@@ -24,7 +24,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
import org.apache.uima.ducc.agent.NodeAgent;
import org.apache.uima.ducc.agent.deploy.ManagedService;
import org.apache.uima.ducc.agent.deploy.ServiceAdapter;
@@ -49,6 +51,9 @@ public class UimaAsServiceConfiguration
@Autowired
CommonConfiguration common;
+ RouteBuilder routeBuilder;
+ CamelContext camelContext;
+
/**
* Creates Camel Router to handle incoming messages
*
@@ -68,9 +73,11 @@ public class UimaAsServiceConfiguration
onException(Exception.class).handled(true).process(new ErrorProcessor()).end();
from(common.managedServiceEndpoint)
+
.choice().when(filter)
.bean(delegate)
- .end();
+ .end()
+ .setId(common.managedServiceEndpoint);
}
};
@@ -108,7 +115,7 @@ public class UimaAsServiceConfiguration
// responsible for providing the IP in this process environment.
String thisNodeIP =
(System.getenv("IP") == null) ? InetAddress.getLocalHost().getHostAddress() : System.getenv("IP");
- CamelContext camelContext = common.camelContext();
+ camelContext = common.camelContext();
int serviceSocketPort = 0;
String agentSocketParams="";
String jpSocketParams="";
@@ -141,8 +148,10 @@ public class UimaAsServiceConfiguration
ManagedUimaService service =
- new ManagedUimaService(common.saxonJarPath,common.dd2SpringXslPath, serviceAdapter(eventDispatcher,common.managedServiceEndpoint), camelContext);
-
+ new ManagedUimaService(common.saxonJarPath,
+ common.dd2SpringXslPath,
+ serviceAdapter(eventDispatcher,common.managedServiceEndpoint), camelContext);
+ service.setConfigFactory(this);
service.setAgentStateUpdateEndpoint(common.managedProcessStateUpdateEndpoint);
System.out.println("#######################################################");
@@ -152,7 +161,8 @@ public class UimaAsServiceConfiguration
ProcessEventListener delegateListener = processDelegateListener(service);
delegateListener.setDuccEventDispatcher(eventDispatcher);
- camelContext.addRoutes(this.routeBuilderForIncomingRequests(thisNodeIP, delegateListener));
+ routeBuilder = this.routeBuilderForIncomingRequests(thisNodeIP, delegateListener);
+ camelContext.addRoutes(routeBuilder);
return service;
@@ -161,6 +171,16 @@ public class UimaAsServiceConfiguration
throw e;
}
}
+ public void stop() throws Exception {
+ if ( camelContext != null ) {
+ for( Route route : camelContext.getRoutes() ) {
+
+ route.getConsumer().stop();
+ System.out.println(">>> configFactory.stop() - stopped route:"+route.getId());
+ }
+ }
+ //camelContext.stop();
+ }
private class DuccProcessFilter implements Predicate {
String thisNodeIP;
public DuccProcessFilter(final String thisNodeIP) {