From cbcefad90027b7f008fbe360552f129488cd013b Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 1 Feb 2020 19:02:48 +0100 Subject: [PATCH] Move syslog function --- src/hasp_debug.cpp | 16 ++++++++++++++++ src/hasp_debug.h | 2 ++ src/hasp_log.cpp | 14 +++----------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp index 351f505a..5c0afdfd 100644 --- a/src/hasp_debug.cpp +++ b/src/hasp_debug.cpp @@ -70,6 +70,22 @@ void serialPrintln(String debugText) Serial.println(debugTimeText); } +void syslogSend(uint8_t log, const char * debugText) +{ + if(WiFi.isConnected() && debugSyslogHost != "") { + switch(log) { + case 1: + syslog.log(LOG_WARNING, debugText); + break; + case2: + syslog.log(LOG_ERR, debugText); + break; + default: + syslog.log(LOG_INFO, debugText); + } + } +} + void debugStop() { Serial.flush(); diff --git a/src/hasp_debug.h b/src/hasp_debug.h index 5f5e913c..c7519ea2 100644 --- a/src/hasp_debug.h +++ b/src/hasp_debug.h @@ -7,4 +7,6 @@ void debugStop(void); void serialPrintln(String debugText); +void syslogSend(uint8_t log, const char * debugText); + #endif \ No newline at end of file diff --git a/src/hasp_log.cpp b/src/hasp_log.cpp index 7eb1e702..6297a5c7 100644 --- a/src/hasp_log.cpp +++ b/src/hasp_log.cpp @@ -15,7 +15,7 @@ void debugPrintln(String debugText) { serialPrintln(debugText); - // if(WiFi.isConnected()) syslog.log(LOG_INFO, debugText); + syslogSend(0, debugText.c_str()); } void errorPrintln(String debugText) @@ -23,11 +23,7 @@ void errorPrintln(String debugText) char buffer[256]; sprintf_P(buffer, debugText.c_str(), PSTR("[ERROR] ")); serialPrintln(buffer); - if(WiFi.isConnected()) { - char buffer[256]; - sprintf_P(buffer, debugText.c_str(), ""); - // syslog.log(LOG_ERR, buffer); - } + syslogSend(2, buffer); } void warningPrintln(String debugText) @@ -35,9 +31,5 @@ void warningPrintln(String debugText) char buffer[256]; sprintf_P(buffer, debugText.c_str(), PSTR("[WARNING] ")); serialPrintln(buffer); - if(WiFi.isConnected()) { - char buffer[256]; - sprintf_P(buffer, debugText.c_str(), ""); - // syslog.log(LOG_WARNING, buffer); - } + syslogSend(1, buffer); } \ No newline at end of file