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

v3.7.2

Browse Source
This commit is contained in:
proddy
2025-03-22 10:32:03 +01:00
parent e418b7d8e7
commit eaa277fef0
281 changed files with 15297 additions and 21851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,6 @@
#include "uuid/syslog.h"
#include "../../../src/emsesp.h"
#ifndef UUID_SYSLOG_HAVE_GETTIMEOFDAY
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
// time() does not return UTC on the ESP8266: https://github.com/esp8266/Arduino/issues/4637
@@ -233,8 +231,8 @@ SyslogService::QueuedLogMessage::QueuedLogMessage(unsigned long id, std::shared_
: id_(id)
, content_(std::move(content)) {
// Added for EMS-ESP
// check for Ethernet too. This assumes the network has already started.
if (time_good_ || emsesp::EMSESP::system_.network_connected()) {
// if (time_good_ || emsesp::EMSESP::system_.network_connected()) {
if (time_good_) {
#if UUID_SYSLOG_HAVE_GETTIMEOFDAY
if (gettimeofday(&time_, nullptr) != 0) {
time_.tv_sec = (time_t)-1;
@@ -364,9 +362,9 @@ bool SyslogService::can_transmit() {
}
#endif
if (!emsesp::EMSESP::system_.network_connected()) {
return false;
}
// if (!emsesp::EMSESP::system_.network_connected()) {
// return false;
// }
const uint64_t now = uuid::get_uptime_ms();
uint64_t message_delay = UUID_SYSLOG_UDP_BASE_MESSAGE_DELAY;