From e3ab6a795977c892a787493825ad4adda41b5bb4 Mon Sep 17 00:00:00 2001
From: Railag <whenthegroundcavedin@gmail.com>
Date: Thu, 27 Dec 2018 13:38:58 +0300
Subject: [PATCH] Release 1.0.8 (#173)

* add build stage for release branch

* rename build stage for master branch

* remove additional mvn build on stages

* feat(core) version placeholder (EWC-410)

* bug(fix) updated docker url validation (EWC-412) (#157)

* version 1.0.6

* EWC-410 version placeholder

* EWC-414 watchdog feature fix

* bug(core) fixed strace request (#162)

* EWC-421 strace feature bug

* EWC-421 strace feature fix

* Bug(fix) message bug: concurrent usage of session object which isn't thread safe (EWC-433)

* bug(fix) fixed help logs measurement (EWC-431) (#166)

* bug(fix) microservice removal: networking microservice isn't removed (EWC-424)

* Bug(fix) microservice removal: removed extra host mapping (EWC-424)

* Bug(fix) microservice removal: simplified getRunningContainers method (EWC-424)

* version 1.0.7

* 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)

* version 1.0.8 (#172)
---
 client/pom.xml                                                | 2 +-
 daemon/pom.xml                                                | 2 +-
 daemon/src/org/eclipse/iofog/field_agent/FieldAgent.java      | 4 ++--
 .../org/eclipse/iofog/local_api/ControlWebsocketHandler.java  | 1 -
 daemon/src/org/eclipse/iofog/local_api/HalApiHandler.java     | 0
 .../src/org/eclipse/iofog/process_manager/ProcessManager.java | 1 -
 iofog_version_controller/pom.xml                              | 2 +-
 pom.xml                                                       | 2 +-
 8 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 daemon/src/org/eclipse/iofog/local_api/HalApiHandler.java

diff --git a/client/pom.xml b/client/pom.xml
index efe39ebc..19976822 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>iofog-agent</artifactId>
-		<version>1.0.7</version>
+		<version>1.0.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/daemon/pom.xml b/daemon/pom.xml
index ea97eda1..201b0fa7 100644
--- a/daemon/pom.xml
+++ b/daemon/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>iofog-agent</artifactId>
-		<version>1.0.7</version>
+		<version>1.0.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/daemon/src/org/eclipse/iofog/field_agent/FieldAgent.java b/daemon/src/org/eclipse/iofog/field_agent/FieldAgent.java
index 0195d849..9019afcc 100644
--- 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
index 6eeb6f1a..a87e2ff4 100644
--- 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
deleted file mode 100644
index e69de29b..00000000
diff --git a/daemon/src/org/eclipse/iofog/process_manager/ProcessManager.java b/daemon/src/org/eclipse/iofog/process_manager/ProcessManager.java
index 9c5d72b1..af0b1414 100644
--- a/daemon/src/org/eclipse/iofog/process_manager/ProcessManager.java
+++ b/daemon/src/org/eclipse/iofog/process_manager/ProcessManager.java
@@ -209,7 +209,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)))
diff --git a/iofog_version_controller/pom.xml b/iofog_version_controller/pom.xml
index 38306865..49b1ead8 100644
--- a/iofog_version_controller/pom.xml
+++ b/iofog_version_controller/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>iofog-agent</artifactId>
         <groupId>org.eclipse</groupId>
-        <version>1.0.7</version>
+        <version>1.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index eaeebf9b..eca3cb0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse</groupId>
 	<artifactId>iofog-agent</artifactId>
-	<version>1.0.7</version>
+	<version>1.0.8</version>
 	<name>iofog-agent</name>
 	<packaging>pom</packaging>