From 473dd6cbccb1fb51b50c6137eac0bef48c0ae994 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sat, 19 Apr 2025 13:59:33 +0200 Subject: [PATCH] Use new logging function in syslog module --- src/SyslogLogger.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/SyslogLogger.cpp b/src/SyslogLogger.cpp index 0c7a8c11..df5251e0 100644 --- a/src/SyslogLogger.cpp +++ b/src/SyslogLogger.cpp @@ -1,15 +1,17 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2022-2024 Thomas Basler and others + * Copyright (C) 2022-2025 Thomas Basler and others */ #include #include #include "defaults.h" #include "SyslogLogger.h" #include "Configuration.h" -#include "MessageOutput.h" #include "NetworkSettings.h" +#undef TAG +static const char* TAG = "syslog"; + SyslogLogger::SyslogLogger() : _loopTask(TASK_IMMEDIATE, TASK_FOREVER, std::bind(&SyslogLogger::loop, this)) { @@ -32,18 +34,18 @@ void SyslogLogger::updateSettings(const String&& hostname) disable(); if (!config.Enabled) { - MessageOutput.println("[SyslogLogger] Syslog not enabled"); + ESP_LOGI(TAG, "Syslog not enabled"); return; } _port = config.Port; _syslog_hostname = config.Hostname; if (_syslog_hostname.isEmpty()) { - MessageOutput.println("[SyslogLogger] Hostname not configured"); + ESP_LOGW(TAG, "Hostname not configured"); return; } - MessageOutput.printf("[SyslogLogger] Logging to %s!\r\n", _syslog_hostname.c_str()); + ESP_LOGI(TAG, "Logging to %s!", _syslog_hostname.c_str()); _header = "<14>1 - "; // RFC5424: Facility USER, severity INFO, version 1, NIL timestamp. _header += hostname; @@ -79,7 +81,7 @@ void SyslogLogger::write(const uint8_t *buffer, size_t size) void SyslogLogger::disable() { - MessageOutput.println("[SyslogLogger] Disable"); + ESP_LOGI(TAG, "Disable"); std::lock_guard lock(_mutex); if (_enabled) { _enabled = false; @@ -92,7 +94,7 @@ void SyslogLogger::enable() { // Bind random source port. if (!_udp.begin(0)) { - MessageOutput.println("[SyslogLogger] No sockets available"); + ESP_LOGE(TAG, "No sockets available"); return; } @@ -115,10 +117,6 @@ bool SyslogLogger::resolveAndStart() } _address = _udp.remoteIP(); // Store resolved address. } - _udp.print(_header); - _udp.print("[SyslogLogger] Logging to "); - _udp.print(_syslog_hostname); - _udp.endPacket(); _udp.beginPacket(_address, _port); _udp.print(_header); return true;