From 4e7264701f825919b6d23fbd174a96931a2321c0 Mon Sep 17 00:00:00 2001 From: cube Date: Fri, 26 Jul 2024 21:46:55 +0200 Subject: [PATCH] Respond to unsuitable input messages with error --- src/jpackage/resources-linux/postinst | 2 ++ src/jpackage/resources-linux/prerm | 2 ++ src/main/java/oolite/starter/mqtt/MQTTAdapter.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/jpackage/resources-linux/postinst b/src/jpackage/resources-linux/postinst index 8d56165..e4b4568 100644 --- a/src/jpackage/resources-linux/postinst +++ b/src/jpackage/resources-linux/postinst @@ -18,6 +18,8 @@ set -e # the debian-policy package echo $0 called with $* +printenv | sort +pwd package_type=deb LAUNCHER_AS_SERVICE_SCRIPTS diff --git a/src/jpackage/resources-linux/prerm b/src/jpackage/resources-linux/prerm index 9c50c51..c975af9 100644 --- a/src/jpackage/resources-linux/prerm +++ b/src/jpackage/resources-linux/prerm @@ -18,6 +18,8 @@ set -e echo $0 called with $* +printenv | sort +pwd package_type=deb #COMMON_SCRIPTS diff --git a/src/main/java/oolite/starter/mqtt/MQTTAdapter.java b/src/main/java/oolite/starter/mqtt/MQTTAdapter.java index 4143b46..982579a 100644 --- a/src/main/java/oolite/starter/mqtt/MQTTAdapter.java +++ b/src/main/java/oolite/starter/mqtt/MQTTAdapter.java @@ -41,6 +41,7 @@ public class MQTTAdapter implements PlistListener { private String TOPIC_OOLITE_LOG = "oolite/log"; private String TOPIC_OOLITE_WORLDEVENT = "oolite/worldEvent"; private String TOPIC_OOLITE_SHOWCONSOLE = "oolite/showConsole"; + private String TOPIC_OOLITE_ERROR = "oolite/starter"; /** * Creates a new instance. @@ -69,6 +70,7 @@ public void init(TCPServer tcpServer, Installation.Mqtt mqtt) { TOPIC_OOLITE_LOG = MqttUtil.getTopic(prefix, "oolite/log"); TOPIC_OOLITE_WORLDEVENT = MqttUtil.getTopic(prefix, "oolite/worldEvent"); TOPIC_OOLITE_SHOWCONSOLE = MqttUtil.getTopic(prefix, "oolite/showConsole"); + TOPIC_OOLITE_ERROR = MqttUtil.getTopic(prefix, "oolite/starter"); this.tcpServer = tcpServer; tcpServer.addConnectorStatusListener(new Connector.ConnectorStatusListener() { @@ -127,6 +129,7 @@ public void messageArrived(String topic, MqttMessage mm) throws Exception { } } catch (Exception e) { log.error("Could not consume message {}", mm); + sendMqtt(TOPIC_OOLITE_ERROR, String.format("Could not consume message %s", String.valueOf(mm))); } } });