Epankou/bug routes update ewc 374 (#171)

* Bug(fix) microservice removal: networking microsrevice isn't removed (EWC-424) * Bug(fix) microservice removal: removed extra host mapping (EWC-424) * Bug(fix) microservice removal: simplified getRunningContainers method (EWC-424) * Bug(fix) route update: added missing method for route update (EWC-374)
eclipse-iofog · Dec 27, 2018 · 00c4e53 · 00c4e53
1 parent 8ef66fa
commit 00c4e53
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/daemon/src/org/eclipse/iofog/field_agent/FieldAgent.java b/daemon/src/org/eclipse/iofog/field_agent/FieldAgent.java
@@ -294,13 +294,13 @@ private void verificationFailed() {
 
                         if (microserviceConfig) {
                             processMicroserviceConfig(microservices);
+                            LocalApi.getInstance().update();
                         }
 
                         if (routing) {
                             processRoutes(microservices);
+                            MessageBus.getInstance().update();
                         }
-
-                        LocalApi.getInstance().update();
                     }
                     if (changes.getBoolean("tunnel") && !initialization) {
                         sshProxyManager.update(getProxyConfig());

diff --git a/daemon/src/org/eclipse/iofog/local_api/ControlWebsocketHandler.java b/daemon/src/org/eclipse/iofog/local_api/ControlWebsocketHandler.java
@@ -75,7 +75,6 @@ public void handle(ChannelHandlerContext ctx, HttpRequest req) {
 
 		WebSocketMap.addWebsocket('C', id, ctx);
 		StatusReporter.setLocalApiStatus().setOpenConfigSocketsCount(WebSocketMap.controlWebsocketMap.size());
-
 	}
 
 	/**

diff --git a/daemon/src/org/eclipse/iofog/local_api/HalApiHandler.java b/daemon/src/org/eclipse/iofog/local_api/HalApiHandler.java
diff --git a/daemon/src/org/eclipse/iofog/process_manager/ProcessManager.java b/daemon/src/org/eclipse/iofog/process_manager/ProcessManager.java
@@ -30,7 +30,6 @@
 import static java.lang.String.format;
 import static org.eclipse.iofog.process_manager.ContainerTask.Tasks.*;
 import static org.eclipse.iofog.utils.Constants.ControllerStatus.OK;
-import static org.eclipse.iofog.utils.Constants.IOFOG_DOCKER_CONTAINER_NAME_PREFIX;
 import static org.eclipse.iofog.utils.Constants.PROCESS_MANAGER;
 
 /**
@@ -209,7 +208,6 @@ private void deleteOldAgentMicroservices() {
 	 */
 	private void deleteObsoleteAgentMicroservices(Set<Microservice> allAgentMicroservices) {
 		docker.getRunningIofogContainers().stream()
-			.filter(container -> docker.getContainerName(container).startsWith(IOFOG_DOCKER_CONTAINER_NAME_PREFIX))
 			.map(container -> docker.getContainerMicroserviceUuid(container))
 			.filter(microserviceUuid -> allAgentMicroservices.stream()
 				.noneMatch(microservice -> microservice.getMicroserviceUuid().equals(microserviceUuid)))