Browse Source

Extra logging and gateway fix

pull/92/merge
Andrew Shvayka 9 years ago
parent
commit
b8b27ec3f2
  1. 9
      extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributes.java
  2. 3
      extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java
  3. 4
      extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java
  4. 1
      transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java

9
extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributes.java

@ -91,4 +91,13 @@ public class DeviceAttributes {
} }
return map; return map;
} }
@Override
public String toString() {
return "DeviceAttributes{" +
"clientSideAttributesMap=" + clientSideAttributesMap +
", serverPrivateAttributesMap=" + serverPrivateAttributesMap +
", serverPublicAttributesMap=" + serverPublicAttributesMap +
'}';
}
} }

3
extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java

@ -15,6 +15,7 @@
*/ */
package org.thingsboard.server.extensions.core.action.template; package org.thingsboard.server.extensions.core.action.template;
import lombok.extern.slf4j.Slf4j;
import org.apache.velocity.Template; import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext; import org.apache.velocity.VelocityContext;
import org.apache.velocity.runtime.parser.ParseException; import org.apache.velocity.runtime.parser.ParseException;
@ -35,6 +36,7 @@ import java.util.Optional;
/** /**
* @author Andrew Shvayka * @author Andrew Shvayka
*/ */
@Slf4j
public abstract class AbstractTemplatePluginAction<T extends TemplateActionConfiguration> extends SimpleRuleLifecycleComponent implements PluginAction<T> { public abstract class AbstractTemplatePluginAction<T extends TemplateActionConfiguration> extends SimpleRuleLifecycleComponent implements PluginAction<T> {
protected T configuration; protected T configuration;
protected Template template; protected Template template;
@ -69,6 +71,7 @@ public abstract class AbstractTemplatePluginAction<T extends TemplateActionConfi
} }
protected String getMsgBody(RuleContext ctx, ToDeviceActorMsg msg) { protected String getMsgBody(RuleContext ctx, ToDeviceActorMsg msg) {
log.trace("Creating context for: {} and payload {}", ctx.getDeviceAttributes(), msg.getPayload());
VelocityContext context = VelocityUtils.createContext(ctx.getDeviceAttributes(), msg.getPayload()); VelocityContext context = VelocityUtils.createContext(ctx.getDeviceAttributes(), msg.getPayload());
return VelocityUtils.merge(template, context); return VelocityUtils.merge(template, context);
} }

4
extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java

@ -16,6 +16,7 @@
package org.thingsboard.server.extensions.kafka.plugin; package org.thingsboard.server.extensions.kafka.plugin;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.ProducerRecord;
import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.RuleId;
@ -30,6 +31,7 @@ import org.thingsboard.server.extensions.kafka.action.KafkaActionMsg;
import org.thingsboard.server.extensions.kafka.action.KafkaActionPayload; import org.thingsboard.server.extensions.kafka.action.KafkaActionPayload;
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
public class KafkaMsgHandler implements RuleMsgHandler { public class KafkaMsgHandler implements RuleMsgHandler {
private final Producer<?, String> producer; private final Producer<?, String> producer;
@ -40,7 +42,7 @@ public class KafkaMsgHandler implements RuleMsgHandler {
throw new RuleException("Unsupported message type " + msg.getClass().getName() + "!"); throw new RuleException("Unsupported message type " + msg.getClass().getName() + "!");
} }
KafkaActionPayload payload = ((KafkaActionMsg) msg).getPayload(); KafkaActionPayload payload = ((KafkaActionMsg) msg).getPayload();
log.debug("Processing kafka payload: {}", payload);
try { try {
producer.send(new ProducerRecord<>(payload.getTopic(), payload.getMsgBody()), producer.send(new ProducerRecord<>(payload.getTopic(), payload.getMsgBody()),
(metadata, e) -> { (metadata, e) -> {

1
transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java

@ -78,6 +78,7 @@ public class GatewaySessionCtx {
Device newDevice = new Device(); Device newDevice = new Device();
newDevice.setTenantId(gateway.getTenantId()); newDevice.setTenantId(gateway.getTenantId());
newDevice.setName(deviceName); newDevice.setName(deviceName);
newDevice.setType("default");
return deviceService.saveDevice(newDevice); return deviceService.saveDevice(newDevice);
}); });
GatewayDeviceSessionCtx ctx = new GatewayDeviceSessionCtx(this, device); GatewayDeviceSessionCtx ctx = new GatewayDeviceSessionCtx(this, device);

Loading…
Cancel
Save