andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

add back TZ to syslog

Browse Source
This commit is contained in:
Proddy
2023-01-12 17:39:07 +01:00
parent 755f1d17d6
commit fbfd792416
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/uuid-syslog/src/syslog.cpp
View File

@@ -324,7 +324,7 @@ void SyslogService::loop() {
} }
bool SyslogService::can_transmit() { bool SyslogService::can_transmit() {
// TODO add this like in v3.5? // TODO removed this, it was in <v3.5. Do we need to add it back? not sure what it did.
/* /*
if (!host_.empty() && (uint32_t)ip_ == 0) { if (!host_.empty() && (uint32_t)ip_ == 0) {
WiFi.hostByName(host_.c_str(), ip_); WiFi.hostByName(host_.c_str(), ip_);
@@ -452,10 +452,9 @@ bool SyslogService::can_transmit() {
bool SyslogService::transmit(const QueuedLogMessage & message) { bool SyslogService::transmit(const QueuedLogMessage & message) {
struct tm tm; struct tm tm;
// Changes for EMS-ESP by MichaelDvP // Changes for EMS-ESP
// TODO add this like in v3.5? int8_t tzh = 0;
// int8_t tzh = 0; int8_t tzm = 0;
// int8_t tzm = 0;
tm.tm_year = 0; tm.tm_year = 0;
if (message.time_.tv_sec != (time_t)-1) { if (message.time_.tv_sec != (time_t)-1) {
@@ -465,9 +464,9 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
int16_t diff = 60 * (tm.tm_hour - utc.tm_hour) + tm.tm_min - utc.tm_min; int16_t diff = 60 * (tm.tm_hour - utc.tm_hour) + tm.tm_min - utc.tm_min;
diff = diff > 720 ? diff - 1440 : diff < -720 ? diff + 1440 : diff; diff = diff > 720 ? diff - 1440 : diff < -720 ? diff + 1440 : diff;
// From previous EMS-ESP. Need to check if still needed. // added for EMS-ESP
// tzh = diff / 60; tzh = diff / 60;
// tzm = diff < 0 ? (0 - diff) % 60 : diff % 60; tzm = diff < 0 ? (0 - diff) % 60 : diff % 60;
} }
if (udp_.beginPacket(ip_, port_) != 1) { if (udp_.beginPacket(ip_, port_) != 1) {
@@ -494,31 +493,30 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
udp_.printf("<%u>1 ", (uint8_t)(message.content_->facility * 8U) + std::min(7U, (unsigned int)message.content_->level)); udp_.printf("<%u>1 ", (uint8_t)(message.content_->facility * 8U) + std::min(7U, (unsigned int)message.content_->level));
if (tm.tm_year != 0) { if (tm.tm_year != 0) {
udp_.printf_P("%04u-%02u-%02uT%02u:%02u:%02u.%06luZ", // udp_.printf_P("%04u-%02u-%02uT%02u:%02u:%02u.%06luZ",
tm.tm_year + 1900,
tm.tm_mon + 1,
tm.tm_mday,
tm.tm_hour,
tm.tm_min,
tm.tm_sec,
(unsigned long)message.time_.tv_usec);
// udp_.printf("%04u-%02u-%02uT%02u:%02u:%02u.%06u%+02d:%02d",
// tm.tm_year + 1900, // tm.tm_year + 1900,
// tm.tm_mon + 1, // tm.tm_mon + 1,
// tm.tm_mday, // tm.tm_mday,
// tm.tm_hour, // tm.tm_hour,
// tm.tm_min, // tm.tm_min,
// tm.tm_sec, // tm.tm_sec,
// (unsigned long)message.time_.tv_usec, // (unsigned long)message.time_.tv_usec);
// tzh,
// tzm); // added for EMS-ESP
udp_.printf("%04u-%02u-%02uT%02u:%02u:%02u.%06lu%+02d:%02d",
tm.tm_year + 1900,
tm.tm_mon + 1,
tm.tm_mday,
tm.tm_hour,
tm.tm_min,
tm.tm_sec,
(unsigned long)message.time_.tv_usec,
tzh,
tzm);
} else { } else {
udp_.print('-'); udp_.print('-');
} }
// Changes for EMS-ESP by MichaelDvP
udp_.printf_P(PSTR(" %s %s - - - "), hostname_.c_str(), (message.content_->name)); udp_.printf_P(PSTR(" %s %s - - - "), hostname_.c_str(), (message.content_->name));
char id_c_str[15]; char id_c_str[15];