patrick/Sensor3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log to MQTT newline FIX

Browse Source
This commit is contained in:
Patrick Haßel 2024-04-10 12:47:59 +02:00
parent 6db1dded52
commit 33a8ad6198
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/patrix/log.cpp
View File

@ -16,14 +16,18 @@ void log(const char *level, const char *module, const char *format, va_list vl)
char datetime[26]; char datetime[26];
getDateTime(datetime, sizeof datetime); getDateTime(datetime, sizeof datetime);
char header[50]; char header[45];
snprintf(header, sizeof header, " | %-5s | %-15s | ", level, module); snprintf(header, sizeof header, " | %-5s | %-10s | ", level, module);
char message[500]; char message[500];
vsnprintf(message, sizeof message, format, vl); vsnprintf(message, sizeof message, format, vl);
const size_t len = Serial.print(datetime) + Serial.print(header) + Serial.print(message) + Serial.println(); Serial.print(datetime);
mqttPublishLog(len, datetime, header, message); Serial.print(header);
Serial.print(message);
Serial.println();
mqttPublishLog(datetime, header, message);
} }
void debug(const char *module, const char *format, ...) { void debug(const char *module, const char *format, ...) {

4
lib/patrix/mqtt.cpp
View File

@ -60,8 +60,8 @@ void mqttLoop() {
mqtt.loop(); mqtt.loop();
} }
void mqttPublishLog(const size_t len, const char *datetime, const char *header, const char *message) { void mqttPublishLog(const char *datetime, const char *header, const char *message) {
if (mqtt.beginPublish(logTopic, len, false)) { if (mqtt.beginPublish(logTopic, strlen(datetime) + strlen(header) + strlen(message), false)) {
mqtt.print(datetime); mqtt.print(datetime);
mqtt.print(header); mqtt.print(header);
mqtt.print(message); mqtt.print(message);

2
lib/patrix/mqtt.h
View File

@ -9,7 +9,7 @@ void mqttLoop();
void mqttDisconnect(); void mqttDisconnect();
void mqttPublishLog(const size_t len, const char *datetime, const char *header, const char *message); void mqttPublishLog(const char *datetime, const char *header, const char *message);
bool mqttPublishData(const char *name, const JsonDocument &doc); bool mqttPublishData(const char *name, const JsonDocument &doc);