svn commit: r1779096 - /uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java

[cw...@apache.org]

Author: cwiklik
Date: Mon Jan 16 20:06:24 2017
New Revision: 1779096

URL: http://svn.apache.org/viewvc?rev=1779096&view=rev
Log:
UIMA-5157 fixed cause for agent not stopping on admin stop request

Modified:
    uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java

Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java?rev=1779096&r1=1779095&r2=1779096&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java Mon Jan 16 20:06:24 2017
@@ -23,10 +23,13 @@ import java.util.Map.Entry;
 
 import javax.annotation.PostConstruct;
 
+import org.apache.activemq.camel.component.ActiveMQComponent;
 import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
 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.dataformat.xstream.XStreamDataFormat;
 import org.apache.camel.impl.DefaultClassResolver;
@@ -471,19 +474,19 @@ public class AgentConfiguration {
       camelContext.addRoutes(metricsRouteBuilder);
   
   }
-  
+  public void stopRoutes() throws Exception {
+	  camelContext.stop();
+	  logger.info("AgentConfigureation.stopRoutes", null,"Camel Context stopped");
+	  
+  }
   @Bean
   @PostConstruct
-//  public NodeMetricsProcessor nodeMetricsProcessor(NodeAgent agent) throws Exception {
   public NodeMetricsProcessor nodeMetricsProcessor() throws Exception {
     if (Utils.isLinux()) {
-//      return new LinuxNodeMetricsProcessor(agent, "/proc/meminfo", "/proc/loadavg");
    	  nodeMetricsProcessor = new LinuxNodeMetricsProcessor();
 	  ((LinuxNodeMetricsProcessor)nodeMetricsProcessor).initMemInfo("/proc/meminfo");
 	  ((LinuxNodeMetricsProcessor)nodeMetricsProcessor).initLoadAvg("/proc/loadavg");
-  	  //agent, "/proc/meminfo", "/proc/loadavg");
     } else {
-//        return new DefaultNodeMetricsProcessor(agent);
     	nodeMetricsProcessor = new DefaultNodeMetricsProcessor();
     }
     return nodeMetricsProcessor;