Mirrors/OpenDTU
2
0
Fork 0
mirror of https://github.com/tbnobody/OpenDTU.git synced 2025-12-11 01:10:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Syslog: Send dynamic headers based on log level of the message

Browse Source 
The code part regarding overflow was also removed as the write method 1 in any case. Different handling regarding line break etc. in one message was also removed as the function is called only containing one log line from MessageOutput.
This commit is contained in:
Thomas Basler
2025-04-19 15:14:12 +02:00
parent 633d9b9802
commit 030df8b715
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/SyslogLogger.h
View File

@@ -19,6 +19,7 @@ private:
bool isResolved() const {
return _address != INADDR_NONE;
}
static uint8_t calculatePrival(uint8_t facility, char errorCode);
Task _loopTask;
std::mutex _mutex;

38
src/SyslogLogger.cpp
View File

@@ -47,7 +47,7 @@ void SyslogLogger::updateSettings(const String&& hostname)
ESP_LOGI(TAG, "Logging to %s!", _syslog_hostname.c_str());
_header = "<14>1 - "; // RFC5424: Facility USER, severity INFO, version 1, NIL timestamp.
_header = ">1 - "; // RFC5424: Facility USER, severity INFO, version 1, NIL timestamp.
_header += hostname;
_header += " OpenDTU ";
_header += _proc_id;
@@ -64,19 +64,22 @@ void SyslogLogger::write(const uint8_t *buffer, size_t size)
if (!_enabled || !isResolved()) {
return;
}
String header = "<";
header += String(calculatePrival(1, buffer[0]));
_udp.beginPacket(_address, _port);
_udp.print(header);
_udp.print(_header);
for (int i = 0; i < size; i++) {
uint8_t c = buffer[i];
bool overflow = false;
if (c != '\r' && c != '\n') {
// Replace control and non-ASCII characters with '?'.
overflow = !_udp.write(c >= 0x20 && c < 0x7f ? c : '?');
}
if (c == '\n' || overflow) {
_udp.endPacket();
_udp.beginPacket(_address, _port);
_udp.print(_header);
_udp.write(c >= 0x20 && c < 0x7f ? c : '?');
}
}
_udp.endPacket();
}
void SyslogLogger::disable()
@@ -117,11 +120,26 @@ bool SyslogLogger::resolveAndStart()
}
_address = _udp.remoteIP(); // Store resolved address.
}
_udp.beginPacket(_address, _port);
_udp.print(_header);
return true;
}
uint8_t SyslogLogger::calculatePrival(uint8_t facility, char errorCode)
{
// ESP LOG ID's are two ahead of syslog ID's
// e.g. ESP_LOG_ERROR (1) = Syslog ERROR 3
if (errorCode == 'E') {
return facility * 8 + ESP_LOG_ERROR + 2;
} else if (errorCode == 'W') {
return facility * 8 + ESP_LOG_WARN + 2;
} else if (errorCode == 'D') {
return facility * 8 + ESP_LOG_DEBUG + 2;
} else if (errorCode == 'V') {
return facility * 8 + ESP_LOG_VERBOSE + 2;
}
return facility * 8 + ESP_LOG_INFO + 2;
}
void SyslogLogger::loop()
{
std::lock_guard<std::mutex> lock(_mutex);