From cd8d12d40d35ab7ab8caaa452eaaeedfc3aa5e2f Mon Sep 17 00:00:00 2001
From: arovak <arovak@netwize.be>
Date: Wed, 11 Nov 2020 18:26:49 +0100
Subject: [PATCH] fix esp8266 syslog

---
 src/hasp_debug.cpp | 4 ++--
 src/hasp_http.cpp  | 2 +-
 src/hasp_mqtt.cpp  | 4 ++--
 src/hasp_wifi.cpp  | 2 +-
 src/main.cpp       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp
index 1b051da1..27189bd4 100644
--- a/src/hasp_debug.cpp
+++ b/src/hasp_debug.cpp
@@ -425,9 +425,9 @@ static void debugPrintTag(uint8_t tag, Print * _logOutput)
 void debugPrintPrefix(uint8_t tag, int level, Print * _logOutput)
 {
 #if HASP_USE_SYSLOG > 0
-    if(!syslogClient) return;
+    // if(!syslogClient) return;
 
-    if(_logOutput == syslogClient) {
+    if(_logOutput == syslogClient && syslogClient) {
         syslogClient->beginPacket(debugSyslogHost, debugSyslogPort);
 
         // IETF Doc: https://tools.ietf.org/html/rfc5424 - The Syslog Protocol
diff --git a/src/hasp_http.cpp b/src/hasp_http.cpp
index 33a245e3..739d795b 100644
--- a/src/hasp_http.cpp
+++ b/src/hasp_http.cpp
@@ -244,7 +244,7 @@ void webHandleRoot()
         httpMessage +=
             F("<p><form method='get' action='screenshot'><button type='submit'>Screenshot</button></form></p>");
         httpMessage +=
-            PSTR("<p><form method='get' action='config'><button type='submit'>Configuration</button></form></p>");
+            F("<p><form method='get' action='config'><button type='submit'>Configuration</button></form></p>");
 
         httpMessage +=
             F("<p><form method='get' action='firmware'><button type='submit'>Firmware Upgrade</button></form></p>");
diff --git a/src/hasp_mqtt.cpp b/src/hasp_mqtt.cpp
index 13b702d8..fd336333 100644
--- a/src/hasp_mqtt.cpp
+++ b/src/hasp_mqtt.cpp
@@ -438,8 +438,8 @@ void mqttReconnect()
     snprintf_P(buffer, sizeof(buffer), PSTR("%sstatus"), mqttNodeTopic);
     mqttClient.publish(buffer, mqttFirstConnect ? "OFF" : "ON", true); //, 1);
 
-    Log.notice(TAG_MQTT, F("binary_sensor state: [%sstatus] : %s"), mqttNodeTopic,
-               mqttFirstConnect ? PSTR("OFF") : PSTR("ON"));
+    Log.notice(TAG_MQTT, F("binary_sensor state: [%sstatus] : %S"), mqttNodeTopic,
+               mqttFirstConnect ? F("OFF") : F("ON"));
 
     /* snprintf_P(buffer, sizeof(buffer), PSTR("binary_sensor state: [%sstatus] : %s"), mqttNodeTopic,
                mqttFirstConnect ? PSTR("OFF") : PSTR("ON"));
diff --git a/src/hasp_wifi.cpp b/src/hasp_wifi.cpp
index 9db5105b..f3688c74 100644
--- a/src/hasp_wifi.cpp
+++ b/src/hasp_wifi.cpp
@@ -59,7 +59,7 @@ void wifiConnected(IPAddress ipaddress)
 #endif
     Log.verbose(TAG_WIFI, F("Connected = %s"), WiFi.status() == WL_CONNECTED ? PSTR("yes") : PSTR("no"));
     haspProgressVal(255);
-
+    debugSetup();
     // if(isConnected) {
     // mqttReconnect();
     // haspReconnect();
diff --git a/src/main.cpp b/src/main.cpp
index 39dc3bfb..faabd00f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,7 +57,7 @@ void setup()
 #endif
 
     // The network stack needs to be initialized before calling debugSetup, cause syslog needs lwip
-    debugSetup();
+    // debugSetup();
 
     guiSetup();
     if(!oobeSetup()) {