dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few minor improvements

Browse Source
This commit is contained in:
Andrew Shvayka 2018-10-26 14:01:41 +03:00
parent c74e2a8a55
commit 750bd70032
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/src/main/java/org/thingsboard/server/actors/rpc/RpcManagerActor.java
View File

@ -162,9 +162,9 @@ public class RpcManagerActor extends ContextAwareActor {
} }
private void onSessionClose(boolean reconnect, ServerAddress remoteAddress) { private void onSessionClose(boolean reconnect, ServerAddress remoteAddress) {
log.debug("[{}] session closed. Should reconnect: {}", remoteAddress, reconnect); log.info("[{}] session closed. Should reconnect: {}", remoteAddress, reconnect);
SessionActorInfo sessionRef = sessionActors.get(remoteAddress); SessionActorInfo sessionRef = sessionActors.get(remoteAddress);
if (context().sender() != null && context().sender().equals(sessionRef.actor)) { if (sessionRef != null && context().sender() != null && context().sender().equals(sessionRef.actor)) {
sessionActors.remove(remoteAddress); sessionActors.remove(remoteAddress);
pendingMsgs.remove(remoteAddress); pendingMsgs.remove(remoteAddress);
if (reconnect) { if (reconnect) {
@ -182,18 +182,18 @@ public class RpcManagerActor extends ContextAwareActor {
private void register(ServerAddress remoteAddress, UUID uuid, ActorRef sender) { private void register(ServerAddress remoteAddress, UUID uuid, ActorRef sender) {
sessionActors.put(remoteAddress, new SessionActorInfo(uuid, sender)); sessionActors.put(remoteAddress, new SessionActorInfo(uuid, sender));
log.debug("[{}][{}] Registering session actor.", remoteAddress, uuid); log.info("[{}][{}] Registering session actor.", remoteAddress, uuid);
Queue<ClusterAPIProtos.ClusterMessage> data = pendingMsgs.remove(remoteAddress); Queue<ClusterAPIProtos.ClusterMessage> data = pendingMsgs.remove(remoteAddress);
if (data != null) { if (data != null) {
log.debug("[{}][{}] Forwarding {} pending messages.", remoteAddress, uuid, data.size()); log.info("[{}][{}] Forwarding {} pending messages.", remoteAddress, uuid, data.size());
data.forEach(msg -> sender.tell(new RpcSessionTellMsg(msg), ActorRef.noSender())); data.forEach(msg -> sender.tell(new RpcSessionTellMsg(msg), ActorRef.noSender()));
} else { } else {
log.debug("[{}][{}] No pending messages to forward.", remoteAddress, uuid); log.info("[{}][{}] No pending messages to forward.", remoteAddress, uuid);
} }
} }
private ActorRef createSessionActor(RpcSessionCreateRequestMsg msg) { private ActorRef createSessionActor(RpcSessionCreateRequestMsg msg) {
log.debug("[{}] Creating session actor.", msg.getMsgUid()); log.info("[{}] Creating session actor.", msg.getMsgUid());
ActorRef actor = context().actorOf( ActorRef actor = context().actorOf(
Props.create(new RpcSessionActor.ActorCreator(systemContext, msg.getMsgUid())).withDispatcher(DefaultActorService.RPC_DISPATCHER_NAME)); Props.create(new RpcSessionActor.ActorCreator(systemContext, msg.getMsgUid())).withDispatcher(DefaultActorService.RPC_DISPATCHER_NAME));
actor.tell(msg, context().self()); actor.tell(msg, context().self());

3
common/message/src/main/java/org/thingsboard/server/common/msg/cluster/ServerType.java
View File

@ -19,6 +19,5 @@ package org.thingsboard.server.common.msg.cluster;
* Created by ashvayka on 23.09.18. * Created by ashvayka on 23.09.18.
*/ */
public enum ServerType { public enum ServerType {
//Should match content of enum in discovery.proto. CORE
CORE, JS_EVALUATOR
} }