From febfc6443e1f652c04e79bd791a303d313de054d Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 3 Sep 2020 16:27:49 +0300 Subject: [PATCH] Misc fixes --- .../server/controller/AuthController.java | 2 ++ .../server/service/edge/rpc/EdgeGrpcSession.java | 14 +++++++++----- .../thingsboard/server/common/data/EdgeUtils.java | 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java index e00ee733b1..4d586c06ad 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java @@ -235,6 +235,8 @@ public class AuthController extends BaseController { } } + sendNotificationMsgToEdgeService(user.getTenantId(), user.getId(), ActionType.CREDENTIALS_UPDATED); + JwtToken accessToken = tokenFactory.createAccessJwtToken(securityUser); JwtToken refreshToken = refreshTokenRepository.requestRefreshToken(securityUser); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java index 7a088fd836..2232c43286 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java @@ -867,7 +867,7 @@ public final class EdgeGrpcSession implements Closeable { } if (uplinkMsg.getRelationUpdateMsgList() != null && !uplinkMsg.getRelationUpdateMsgList().isEmpty()) { for (RelationUpdateMsg relationUpdateMsg: uplinkMsg.getRelationUpdateMsgList()) { - onRelationUpdate(relationUpdateMsg); + result.add(onRelationUpdate(relationUpdateMsg)); } } if (uplinkMsg.getRuleChainMetadataRequestMsgList() != null && !uplinkMsg.getRuleChainMetadataRequestMsgList().isEmpty()) { @@ -1170,11 +1170,13 @@ public final class EdgeGrpcSession implements Closeable { @Override public void onSuccess(TbQueueMsgMetadata metadata) { // TODO: voba - handle success + log.debug("Successfully send ENTITY_CREATED EVENT to rule engine [{}]", device); } @Override public void onFailure(Throwable t) { // TODO: voba - handle failure + log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", device, t); } }); } catch (JsonProcessingException | IllegalArgumentException e) { @@ -1262,12 +1264,12 @@ public final class EdgeGrpcSession implements Closeable { } return Futures.immediateFuture(null); } catch (Exception e) { - log.error("Error during finding existent alarm", e); - return Futures.immediateFailedFuture(new RuntimeException("Error during finding existent alarm", e)); + log.error("Failed to process alarm update msg [{}]", alarmUpdateMsg, e); + return Futures.immediateFailedFuture(new RuntimeException("Failed to process alarm update msg", e)); } } - private void onRelationUpdate(RelationUpdateMsg relationUpdateMsg) { + private ListenableFuture onRelationUpdate(RelationUpdateMsg relationUpdateMsg) { log.info("onRelationUpdate {}", relationUpdateMsg); try { EntityRelation entityRelation = new EntityRelation(); @@ -1297,8 +1299,10 @@ public final class EdgeGrpcSession implements Closeable { case UNRECOGNIZED: log.error("Unsupported msg type"); } + return Futures.immediateFuture(null); } catch (Exception e) { - log.error("Error during relation update msg", e); + log.error("Failed to process relation update msg [{}]", relationUpdateMsg, e); + return Futures.immediateFailedFuture(new RuntimeException("Failed to process relation update msg", e)); } } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java index 2394ea0047..465e1fcd72 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java @@ -24,6 +24,8 @@ public final class EdgeUtils { public static EdgeEventType getEdgeEventTypeByEntityType(EntityType entityType) { switch (entityType) { + case EDGE: + return EdgeEventType.EDGE; case DEVICE: return EdgeEventType.DEVICE; case ASSET: