From 7cc3d6880d2cc4549d31ea28254470d93400aef0 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Fri, 3 Feb 2017 20:07:54 +0200 Subject: [PATCH 1/3] Fix for errors during shutdown --- .../plugin/PluginWebSocketHandler.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java index e3a337af9c..d1df671972 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java @@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.BeanCreationNotAllowedException; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -57,10 +58,12 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug private static final ConcurrentMap internalSessionMap = new ConcurrentHashMap<>(); private static final ConcurrentMap externalSessionMap = new ConcurrentHashMap<>(); - @Autowired @Lazy + @Autowired + @Lazy private ActorService actorService; - @Autowired @Lazy + @Autowired + @Lazy private PluginService pluginService; @Override @@ -105,7 +108,7 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug super.handleTransportError(session, tError); SessionMetaData sessionMd = internalSessionMap.get(session.getId()); if (sessionMd != null) { - actorService.process(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onError(tError))); + processInActorService(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onError(tError))); } else { log.warn("[{}] Failed to find session", session.getId()); } @@ -118,11 +121,19 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug SessionMetaData sessionMd = internalSessionMap.remove(session.getId()); if (sessionMd != null) { externalSessionMap.remove(sessionMd.sessionRef.getSessionId()); - actorService.process(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onClosed())); + processInActorService(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onClosed())); } log.info("[{}] Session is closed", session.getId()); } + private void processInActorService(SessionEventPluginWebSocketMsg msg) { + try { + actorService.process(msg); + } catch (BeanCreationNotAllowedException e) { + log.warn("[{}] Failed to close session due to possible shutdown state", msg.getSessionRef().getSessionId()); + } + } + private PluginWebsocketSessionRef toRef(WebSocketSession session) throws IOException { URI sessionUri = session.getUri(); String path = sessionUri.getPath(); From 33f6d01a10c5622595eef40c8d13520ea9938760 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Mon, 6 Feb 2017 18:54:18 +0200 Subject: [PATCH 2/3] Version set to 1.1.0 --- application/pom.xml | 2 +- common/data/pom.xml | 2 +- common/message/pom.xml | 2 +- common/pom.xml | 2 +- common/transport/pom.xml | 2 +- dao/pom.xml | 2 +- docker/docker-compose.yml | 4 ++-- docker/thingsboard-db-schema/build_and_deploy.sh | 4 ++-- docker/thingsboard/build_and_deploy.sh | 4 ++-- extensions-api/pom.xml | 2 +- extensions-core/pom.xml | 2 +- extensions/extension-kafka/pom.xml | 2 +- extensions/extension-rabbitmq/pom.xml | 2 +- extensions/extension-rest-api-call/pom.xml | 2 +- extensions/pom.xml | 2 +- pom.xml | 2 +- tools/pom.xml | 2 +- transport/coap/pom.xml | 2 +- transport/http/pom.xml | 2 +- transport/mqtt/pom.xml | 2 +- transport/pom.xml | 2 +- ui/pom.xml | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 6efb019f75..d425217ab4 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/common/data/pom.xml b/common/data/pom.xml index 48a29387a4..1c69e68615 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 common org.thingsboard.common diff --git a/common/message/pom.xml b/common/message/pom.xml index 19b01b0501..b0539fe008 100644 --- a/common/message/pom.xml +++ b/common/message/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 common org.thingsboard.common diff --git a/common/pom.xml b/common/pom.xml index f4e1f15e17..e5c6978607 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/common/transport/pom.xml b/common/transport/pom.xml index 32304ee6a6..8ae3463df0 100644 --- a/common/transport/pom.xml +++ b/common/transport/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 common org.thingsboard.common diff --git a/dao/pom.xml b/dao/pom.xml index 199da1155c..908cd811fd 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d8b0311d28..cacea8c4b9 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,7 +18,7 @@ version: '2' services: thingsboard: - image: "thingsboard/application:1.0.1" + image: "thingsboard/application:1.1.0" ports: - "8080:8080" - "1883:1883" @@ -27,7 +27,7 @@ services: - thingsboard.env entrypoint: ./run_thingsboard.sh thingsboard-db-schema: - image: "thingsboard/thingsboard-db-schema:1.0.1" + image: "thingsboard/thingsboard-db-schema:1.1.0" env_file: - thingsboard-db-schema.env entrypoint: ./install_schema.sh diff --git a/docker/thingsboard-db-schema/build_and_deploy.sh b/docker/thingsboard-db-schema/build_and_deploy.sh index 50320031f6..4cf326cb34 100755 --- a/docker/thingsboard-db-schema/build_and_deploy.sh +++ b/docker/thingsboard-db-schema/build_and_deploy.sh @@ -20,8 +20,8 @@ cp ../../dao/src/main/resources/schema.cql schema.cql cp ../../dao/src/main/resources/demo-data.cql demo-data.cql cp ../../dao/src/main/resources/system-data.cql system-data.cql -docker build -t thingsboard/thingsboard-db-schema:1.0.1 . +docker build -t thingsboard/thingsboard-db-schema:1.1.0 . docker login -docker push thingsboard/thingsboard-db-schema:1.0.1 \ No newline at end of file +docker push thingsboard/thingsboard-db-schema:1.1.0 diff --git a/docker/thingsboard/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh index a97ad05997..2a4d2a2f39 100755 --- a/docker/thingsboard/build_and_deploy.sh +++ b/docker/thingsboard/build_and_deploy.sh @@ -18,8 +18,8 @@ cp ../../application/target/thingsboard.deb thingsboard.deb -docker build -t thingsboard/application:1.0.1 . +docker build -t thingsboard/application:1.1.0 . docker login -docker push thingsboard/application:1.0.1 \ No newline at end of file +docker push thingsboard/application:1.1.0 diff --git a/extensions-api/pom.xml b/extensions-api/pom.xml index 79f4380fb4..65cd5da5ec 100644 --- a/extensions-api/pom.xml +++ b/extensions-api/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml index d4f903b647..0773dcb447 100644 --- a/extensions-core/pom.xml +++ b/extensions-core/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/extensions/extension-kafka/pom.xml b/extensions/extension-kafka/pom.xml index 3b8f803d15..e5e54720ec 100644 --- a/extensions/extension-kafka/pom.xml +++ b/extensions/extension-kafka/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 extensions org.thingsboard.extensions diff --git a/extensions/extension-rabbitmq/pom.xml b/extensions/extension-rabbitmq/pom.xml index a95b7faf17..d4aa696d08 100644 --- a/extensions/extension-rabbitmq/pom.xml +++ b/extensions/extension-rabbitmq/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 extensions org.thingsboard.extensions diff --git a/extensions/extension-rest-api-call/pom.xml b/extensions/extension-rest-api-call/pom.xml index 4c54bf011b..eecec640c3 100644 --- a/extensions/extension-rest-api-call/pom.xml +++ b/extensions/extension-rest-api-call/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 extensions org.thingsboard.extensions diff --git a/extensions/pom.xml b/extensions/pom.xml index 9e2cc309c0..ae1d4f0078 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/pom.xml b/pom.xml index 069c00c40b..c7f45ceae2 100755 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard thingsboard - 1.1.0-SNAPSHOT + 1.1.0 pom Thingsboard diff --git a/tools/pom.xml b/tools/pom.xml index 53a486e546..be130ba449 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml index 0fe08a6b8f..b86897eda0 100644 --- a/transport/coap/pom.xml +++ b/transport/coap/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 transport org.thingsboard.transport diff --git a/transport/http/pom.xml b/transport/http/pom.xml index d348767daa..839e460154 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 transport org.thingsboard.transport diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml index a491226157..ec70b5005d 100644 --- a/transport/mqtt/pom.xml +++ b/transport/mqtt/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 transport org.thingsboard.transport diff --git a/transport/pom.xml b/transport/pom.xml index 4d4a70539f..3cb6d55ab4 100644 --- a/transport/pom.xml +++ b/transport/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard diff --git a/ui/pom.xml b/ui/pom.xml index e80ec33209..b931c049f4 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.1.0-SNAPSHOT + 1.1.0 thingsboard org.thingsboard From 178ac0ac5bc0002d8491268628e6fd4f861de4d6 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Tue, 7 Feb 2017 12:10:22 +0200 Subject: [PATCH 3/3] added latest tag --- docker/thingsboard-db-schema/build_and_deploy.sh | 3 ++- docker/thingsboard/build_and_deploy.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/thingsboard-db-schema/build_and_deploy.sh b/docker/thingsboard-db-schema/build_and_deploy.sh index 4cf326cb34..668990902a 100755 --- a/docker/thingsboard-db-schema/build_and_deploy.sh +++ b/docker/thingsboard-db-schema/build_and_deploy.sh @@ -20,8 +20,9 @@ cp ../../dao/src/main/resources/schema.cql schema.cql cp ../../dao/src/main/resources/demo-data.cql demo-data.cql cp ../../dao/src/main/resources/system-data.cql system-data.cql -docker build -t thingsboard/thingsboard-db-schema:1.1.0 . +docker build -t thingsboard/thingsboard-db-schema:1.1.0 -t thingsboard/thingsboard-db-schema:latest . docker login docker push thingsboard/thingsboard-db-schema:1.1.0 +docker push thingsboard/thingsboard-db-schema:latest \ No newline at end of file diff --git a/docker/thingsboard/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh index 2a4d2a2f39..8037046212 100755 --- a/docker/thingsboard/build_and_deploy.sh +++ b/docker/thingsboard/build_and_deploy.sh @@ -18,8 +18,9 @@ cp ../../application/target/thingsboard.deb thingsboard.deb -docker build -t thingsboard/application:1.1.0 . +docker build -t thingsboard/application:1.1.0 -t thingsboard/application:latest . docker login docker push thingsboard/application:1.1.0 +docker push thingsboard/application:latest \ No newline at end of file