From 1942d59757c2bcb05ea9443fbd831f3189c5bd24 Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Mon, 12 Dec 2022 23:05:10 -0800
Subject: [PATCH] Don't publish MQTT disconnect log messages
And disable the mqtt log callback by default (it's very noisy)
---
src/sbbs3/sbbscon.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c
index bc93e7d8de..8e327c0330 100644
--- a/src/sbbs3/sbbscon.c
+++ b/src/sbbs3/sbbscon.c
@@ -358,18 +358,22 @@ static void mqtt_message_received(struct mosquitto* mosq, void* cbdata, const st
}
}
+#ifdef MOSQUITTO_LOG
static void mqtt_log_msg(struct mosquitto* moq, void* cbdata, int level, const char* str)
{
char msg[1024];
SAFEPRINTF2(msg, "MQTT log_msg(%x): %s", level, str);
log_puts(LOG_DEBUG, msg);
}
+#endif
static void mqtt_disconnected(struct mosquitto* mosq , void* cbdata, int reason)
{
- lprintf(LOG_ERR, "MQTT broker disconnected, reason: %d", reason);
+ char msg[1024];
+ SAFEPRINTF(msg, "MQTT broker disconnected, reason: %d", reason);
+ log_puts(LOG_INFO, msg);
}
-#endif
+#endif // USE_MOSQUITTO
#ifdef __unix__
static pthread_mutex_t setid_mutex;
@@ -1832,7 +1836,9 @@ int main(int argc, char** argv)
#ifdef USE_MOSQUITTO
if(bbs_startup.mqtt.handle != NULL) {
+#ifdef MOSQUITTO_LOG
mosquitto_log_callback_set(bbs_startup.mqtt.handle, mqtt_log_msg);
+#endif
mosquitto_disconnect_callback_set(bbs_startup.mqtt.handle, mqtt_disconnected);
mosquitto_message_callback_set(bbs_startup.mqtt.handle, mqtt_message_received);
for(int i = bbs_startup.first_node; i <= bbs_startup.last_node; i++) {
--
GitLab