Browse Source

Fixed NPE in DataEntry objects and logging statistics of rule chains/nodes

pull/969/head
Andrew Shvayka 8 years ago
parent
commit
d8ac388395
  1. 3
      application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java
  2. 3
      application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java
  3. 4
      application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java
  4. 10
      application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistTick.java
  5. 2
      common/data/src/main/java/org/thingsboard/server/common/data/kv/BooleanDataEntry.java
  6. 2
      common/data/src/main/java/org/thingsboard/server/common/data/kv/DoubleDataEntry.java
  7. 2
      common/data/src/main/java/org/thingsboard/server/common/data/kv/LongDataEntry.java
  8. 2
      common/data/src/main/java/org/thingsboard/server/common/data/kv/StringDataEntry.java
  9. 3
      common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java

3
application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java

@ -57,6 +57,9 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
break; break;
case CLUSTER_EVENT_MSG: case CLUSTER_EVENT_MSG:
break; break;
case STATS_PERSIST_TICK_MSG:
onStatsPersistTick(id);
break;
default: default:
return false; return false;
} }

3
application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java

@ -50,6 +50,9 @@ public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessa
case RULE_TO_SELF_MSG: case RULE_TO_SELF_MSG:
onRuleNodeToSelfMsg((RuleNodeToSelfMsg) msg); onRuleNodeToSelfMsg((RuleNodeToSelfMsg) msg);
break; break;
case STATS_PERSIST_TICK_MSG:
onStatsPersistTick(id);
break;
default: default:
return false; return false;
} }

4
application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java

@ -159,11 +159,11 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
} }
} }
protected void logLifecycleEvent(ComponentLifecycleEvent event) { private void logLifecycleEvent(ComponentLifecycleEvent event) {
logLifecycleEvent(event, null); logLifecycleEvent(event, null);
} }
protected void logLifecycleEvent(ComponentLifecycleEvent event, Exception e) { private void logLifecycleEvent(ComponentLifecycleEvent event, Exception e) {
systemContext.persistLifecycleEvent(tenantId, id, event, e); systemContext.persistLifecycleEvent(tenantId, id, event, e);
} }

10
application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistTick.java

@ -15,4 +15,12 @@
*/ */
package org.thingsboard.server.actors.stats; package org.thingsboard.server.actors.stats;
public final class StatsPersistTick {} import org.thingsboard.server.common.msg.MsgType;
import org.thingsboard.server.common.msg.TbActorMsg;
public final class StatsPersistTick implements TbActorMsg{
@Override
public MsgType getMsgType() {
return MsgType.STATS_PERSIST_TICK_MSG;
}
}

2
common/data/src/main/java/org/thingsboard/server/common/data/kv/BooleanDataEntry.java

@ -33,7 +33,7 @@ public class BooleanDataEntry extends BasicKvEntry {
@Override @Override
public Optional<Boolean> getBooleanValue() { public Optional<Boolean> getBooleanValue() {
return Optional.of(value); return Optional.ofNullable(value);
} }
@Override @Override

2
common/data/src/main/java/org/thingsboard/server/common/data/kv/DoubleDataEntry.java

@ -34,7 +34,7 @@ public class DoubleDataEntry extends BasicKvEntry {
@Override @Override
public Optional<Double> getDoubleValue() { public Optional<Double> getDoubleValue() {
return Optional.of(value); return Optional.ofNullable(value);
} }
@Override @Override

2
common/data/src/main/java/org/thingsboard/server/common/data/kv/LongDataEntry.java

@ -34,7 +34,7 @@ public class LongDataEntry extends BasicKvEntry {
@Override @Override
public Optional<Long> getLongValue() { public Optional<Long> getLongValue() {
return Optional.of(value); return Optional.ofNullable(value);
} }
@Override @Override

2
common/data/src/main/java/org/thingsboard/server/common/data/kv/StringDataEntry.java

@ -35,7 +35,7 @@ public class StringDataEntry extends BasicKvEntry {
@Override @Override
public Optional<String> getStrValue() { public Optional<String> getStrValue() {
return Optional.of(value); return Optional.ofNullable(value);
} }
@Override @Override

3
common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java

@ -110,6 +110,7 @@ public enum MsgType {
ACTOR_SYSTEM_TO_DEVICE_SESSION_ACTOR_MSG, ACTOR_SYSTEM_TO_DEVICE_SESSION_ACTOR_MSG,
TRANSPORT_TO_DEVICE_SESSION_ACTOR_MSG, TRANSPORT_TO_DEVICE_SESSION_ACTOR_MSG,
SESSION_TIMEOUT_MSG, SESSION_TIMEOUT_MSG,
SESSION_CTRL_MSG; SESSION_CTRL_MSG,
STATS_PERSIST_TICK_MSG;
} }

Loading…
Cancel
Save