andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-29 10:09:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
proddy
2025-12-31 21:26:15 +01:00
parent eaa277fef0
commit 28135c225b
385 changed files with 40221 additions and 38187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
*/
#include "uuid/syslog.h"
#include "../../src/core/emsesp.h"
#ifndef UUID_SYSLOG_HAVE_GETTIMEOFDAY
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
@@ -122,7 +123,6 @@ void SyslogService::remove_queued_messages(uuid::log::Level level) {
}
log_message_id_ -= offset;
log_message_fails_ += offset;
}
void SyslogService::log_level(uuid::log::Level level) {
@@ -231,8 +231,7 @@ SyslogService::QueuedLogMessage::QueuedLogMessage(unsigned long id, std::shared_
: id_(id)
, content_(std::move(content)) {
// Added for EMS-ESP
// if (time_good_ || emsesp::EMSESP::system_.network_connected()) {
if (time_good_) {
if (time_good_ || emsesp::EMSESP::system_.network_connected()) {
#if UUID_SYSLOG_HAVE_GETTIMEOFDAY
if (gettimeofday(&time_, nullptr) != 0) {
time_.tv_sec = (time_t)-1;
@@ -347,7 +346,6 @@ void SyslogService::loop() {
}
bool SyslogService::can_transmit() {
// TODO this should be checked also for Eth
if (!host_.empty() && (uint32_t)ip_ == 0) {
WiFi.hostByName(host_.c_str(), ip_);
}
@@ -524,7 +522,7 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
// (unsigned long)message.time_.tv_usec);
// added for EMS-ESP
udp_.printf("%04u-%02u-%02uT%02u:%02u:%02u.%06lu%+02d:%02d",
udp_.printf("%04u-%02u-%02uT%02u:%02u:%02u.%06lu%+03d:%02d",
tm.tm_year + 1900,
tm.tm_mon + 1,
tm.tm_mday,
@@ -538,7 +536,7 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
udp_.print('-');
}
udp_.printf(" %s %s - - - ", hostname_.c_str(), message.content_->name);
udp_.printf(" %s %s - - - ", hostname_.c_str(), message.content_->name ? message.content_->name : "emsesp");
char id_c_str[15];
snprintf(id_c_str, sizeof(id_c_str), " %lu: ", message.id_);