Browse Source

Misc fixes

pull/2436/head
Volodymyr Babak 6 years ago
parent
commit
febfc6443e
  1. 2
      application/src/main/java/org/thingsboard/server/controller/AuthController.java
  2. 14
      application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
  3. 2
      common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java

2
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 accessToken = tokenFactory.createAccessJwtToken(securityUser);
JwtToken refreshToken = refreshTokenRepository.requestRefreshToken(securityUser); JwtToken refreshToken = refreshTokenRepository.requestRefreshToken(securityUser);

14
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()) { if (uplinkMsg.getRelationUpdateMsgList() != null && !uplinkMsg.getRelationUpdateMsgList().isEmpty()) {
for (RelationUpdateMsg relationUpdateMsg: uplinkMsg.getRelationUpdateMsgList()) { for (RelationUpdateMsg relationUpdateMsg: uplinkMsg.getRelationUpdateMsgList()) {
onRelationUpdate(relationUpdateMsg); result.add(onRelationUpdate(relationUpdateMsg));
} }
} }
if (uplinkMsg.getRuleChainMetadataRequestMsgList() != null && !uplinkMsg.getRuleChainMetadataRequestMsgList().isEmpty()) { if (uplinkMsg.getRuleChainMetadataRequestMsgList() != null && !uplinkMsg.getRuleChainMetadataRequestMsgList().isEmpty()) {
@ -1170,11 +1170,13 @@ public final class EdgeGrpcSession implements Closeable {
@Override @Override
public void onSuccess(TbQueueMsgMetadata metadata) { public void onSuccess(TbQueueMsgMetadata metadata) {
// TODO: voba - handle success // TODO: voba - handle success
log.debug("Successfully send ENTITY_CREATED EVENT to rule engine [{}]", device);
} }
@Override @Override
public void onFailure(Throwable t) { public void onFailure(Throwable t) {
// TODO: voba - handle failure // TODO: voba - handle failure
log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", device, t);
} }
}); });
} catch (JsonProcessingException | IllegalArgumentException e) { } catch (JsonProcessingException | IllegalArgumentException e) {
@ -1262,12 +1264,12 @@ public final class EdgeGrpcSession implements Closeable {
} }
return Futures.immediateFuture(null); return Futures.immediateFuture(null);
} catch (Exception e) { } catch (Exception e) {
log.error("Error during finding existent alarm", e); log.error("Failed to process alarm update msg [{}]", alarmUpdateMsg, e);
return Futures.immediateFailedFuture(new RuntimeException("Error during finding existent alarm", e)); return Futures.immediateFailedFuture(new RuntimeException("Failed to process alarm update msg", e));
} }
} }
private void onRelationUpdate(RelationUpdateMsg relationUpdateMsg) { private ListenableFuture<Void> onRelationUpdate(RelationUpdateMsg relationUpdateMsg) {
log.info("onRelationUpdate {}", relationUpdateMsg); log.info("onRelationUpdate {}", relationUpdateMsg);
try { try {
EntityRelation entityRelation = new EntityRelation(); EntityRelation entityRelation = new EntityRelation();
@ -1297,8 +1299,10 @@ public final class EdgeGrpcSession implements Closeable {
case UNRECOGNIZED: case UNRECOGNIZED:
log.error("Unsupported msg type"); log.error("Unsupported msg type");
} }
return Futures.immediateFuture(null);
} catch (Exception e) { } 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));
} }
} }

2
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) { public static EdgeEventType getEdgeEventTypeByEntityType(EntityType entityType) {
switch (entityType) { switch (entityType) {
case EDGE:
return EdgeEventType.EDGE;
case DEVICE: case DEVICE:
return EdgeEventType.DEVICE; return EdgeEventType.DEVICE;
case ASSET: case ASSET:

Loading…
Cancel
Save