Commit 750bd700327dc6a8b2826c698b239b6b52dfe1fc

Authored by Andrew Shvayka
1 parent c74e2a8a

Few minor improvements

... ... @@ -162,9 +162,9 @@ public class RpcManagerActor extends ContextAwareActor {
162 162 }
163 163
164 164 private void onSessionClose(boolean reconnect, ServerAddress remoteAddress) {
165   - log.debug("[{}] session closed. Should reconnect: {}", remoteAddress, reconnect);
  165 + log.info("[{}] session closed. Should reconnect: {}", remoteAddress, reconnect);
166 166 SessionActorInfo sessionRef = sessionActors.get(remoteAddress);
167   - if (context().sender() != null && context().sender().equals(sessionRef.actor)) {
  167 + if (sessionRef != null && context().sender() != null && context().sender().equals(sessionRef.actor)) {
168 168 sessionActors.remove(remoteAddress);
169 169 pendingMsgs.remove(remoteAddress);
170 170 if (reconnect) {
... ... @@ -182,18 +182,18 @@ public class RpcManagerActor extends ContextAwareActor {
182 182
183 183 private void register(ServerAddress remoteAddress, UUID uuid, ActorRef sender) {
184 184 sessionActors.put(remoteAddress, new SessionActorInfo(uuid, sender));
185   - log.debug("[{}][{}] Registering session actor.", remoteAddress, uuid);
  185 + log.info("[{}][{}] Registering session actor.", remoteAddress, uuid);
186 186 Queue<ClusterAPIProtos.ClusterMessage> data = pendingMsgs.remove(remoteAddress);
187 187 if (data != null) {
188   - log.debug("[{}][{}] Forwarding {} pending messages.", remoteAddress, uuid, data.size());
  188 + log.info("[{}][{}] Forwarding {} pending messages.", remoteAddress, uuid, data.size());
189 189 data.forEach(msg -> sender.tell(new RpcSessionTellMsg(msg), ActorRef.noSender()));
190 190 } else {
191   - log.debug("[{}][{}] No pending messages to forward.", remoteAddress, uuid);
  191 + log.info("[{}][{}] No pending messages to forward.", remoteAddress, uuid);
192 192 }
193 193 }
194 194
195 195 private ActorRef createSessionActor(RpcSessionCreateRequestMsg msg) {
196   - log.debug("[{}] Creating session actor.", msg.getMsgUid());
  196 + log.info("[{}] Creating session actor.", msg.getMsgUid());
197 197 ActorRef actor = context().actorOf(
198 198 Props.create(new RpcSessionActor.ActorCreator(systemContext, msg.getMsgUid())).withDispatcher(DefaultActorService.RPC_DISPATCHER_NAME));
199 199 actor.tell(msg, context().self());
... ...
... ... @@ -19,6 +19,5 @@ package org.thingsboard.server.common.msg.cluster;
19 19 * Created by ashvayka on 23.09.18.
20 20 */
21 21 public enum ServerType {
22   - //Should match content of enum in discovery.proto.
23   - CORE, JS_EVALUATOR
  22 + CORE
24 23 }
... ...