From 557f587a0e8912316c306e0fe25b3ffce02e2108 Mon Sep 17 00:00:00 2001 From: Railag Date: Fri, 28 Dec 2018 18:37:19 +0300 Subject: [PATCH] Release merge (#175) * fixed default controller url (#116) * 1.0.1 (#118) * fixed default controller url * 1.0.1 version * EWC-292 fixed iofog-agent info controller status when access token is expired/invalid * build for dev env added * fix travis * renaming client (#120) * renaming client * 1.0.2 * adding dev packages * invalid error message during provision (#122) * invalid error message during provision * invalid error message during provision * update build packages * Epankou/feature microservice removal ewc 306 (#123) * invalid error message during provision * invalid error message during provision * microservice removal * microservice removal EWC-306 * microservice removal EWC-306 * microservice removal EWC-306 * microservice removal EWC-306 * microservice removal EWC-306 * EWC-336 added default device scan frequency value & update error message * EWC-335 fixed config logging parameters validation (#125) * EWC-335 fixed config logging parameters validation * additional warning messages * microservice update fix (#126) * WIP: EWC-345 add notifications (#127) * add notifications to channel * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * 1.0.3 version (#129) * EWC-366 now deprovision works if agent hasn't connection to controller (#132) * EWC-359 controller status renaming ok -> online (#133) * Update HornetQ version * Fix `isolated_docker_container` configuration * EWC-375 config switcher * cleanup * EWC-375 config switcher import fix * EWC-375 fixed help for iofog-agent client * updating config switcher * iofog agent os group fix * version 1.0.4 (#139) * remove preprod env * Update "HttpMime" version (#142) * update version to 1.0.5 (#143) * update version to 1.0.5 * update version to 1.0.5 (#146) * fix(config): validation for watchdog config param only on and off now available Closes EWC-407 * Dbusel/feature ewc 398 auto release (#148) * test GH release automation * edit build condition to build * edit travis file to enable build * fix syntax error in build file * enable release on all branches to test * fix allowing deploy stage * fix tag name * add autorelease for master branch * fix(bug) fixed log disk size validation (EWC-335) (#149) * fix(bug) fixed log disk size validation (EWC-335) * cleanup * fix(bug) fixed certificate exception message (EWC-402) (#150) * fix(bug) stopping agent process while reinstalling iofog-agent (EWC-405) (#151) * fix(bug) stopping agent process while reinstalling iofog-agent (EWC-405) * iofog-agent > iofog-agentd process in order to avoid install process of iofog-agent package * fix(bug) fixed iofog-agent controller connection status (EWC-415) * add build stage for release branch (#154) * fix build for release branch (#155) * add build stage for release branch * rename build stage for master branch * Pre-release 1.0.6 (#159) * 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 * 1.0.7 Release * 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 * 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 @@ org.eclipse iofog-agent - 1.0.7 + 1.0.8 ../pom.xml 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 @@ org.eclipse iofog-agent - 1.0.7 + 1.0.8 ../pom.xml 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 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 @@ iofog-agent org.eclipse - 1.0.7 + 1.0.8 4.0.0 diff --git a/pom.xml b/pom.xml index eaeebf9b..eca3cb0e 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 org.eclipse iofog-agent - 1.0.7 + 1.0.8 iofog-agent pom