From 7fdbd81def077b167f5071fe2a8bcc530d05c535 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 3 Jun 2019 17:05:09 +0200 Subject: [PATCH] Fix setting seriallog using web gui (old) regression Fix setting seriallog using web gui (old) regression --- sonoff/sonoff.ino | 4 +--- sonoff/support.ino | 7 +++++++ sonoff/xdrv_01_webserver.ino | 6 ++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 38f28df0e..318802b80 100755 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1193,9 +1193,7 @@ void MqttDataHandler(char* topic, uint8_t* data, unsigned int data_len) } else if (CMND_SYSLOG == command_code) { if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) { - Settings.syslog_level = payload; - syslog_level = payload; - syslog_timer = 0; + SetSyslog(payload); } Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, command, Settings.syslog_level, syslog_level); } diff --git a/sonoff/support.ino b/sonoff/support.ino index f3faa1798..0bbd58ffe 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1455,6 +1455,13 @@ void SetSeriallog(uint8_t loglevel) seriallog_timer = 0; } +void SetSyslog(uint8_t loglevel) +{ + Settings.syslog_level = loglevel; + syslog_level = loglevel; + syslog_timer = 0; +} + #ifdef USE_WEBSERVER void GetLog(uint8_t idx, char** entry_pp, size_t* len_p) { diff --git a/sonoff/xdrv_01_webserver.ino b/sonoff/xdrv_01_webserver.ino index 66e043ecf..c79e6c908 100644 --- a/sonoff/xdrv_01_webserver.ino +++ b/sonoff/xdrv_01_webserver.ino @@ -1516,13 +1516,11 @@ void LoggingSaveSettings(void) char tmp[sizeof(Settings.syslog_host)]; // Max length is currently 33 WebGetArg("l0", tmp, sizeof(tmp)); - Settings.seriallog_level = (!strlen(tmp)) ? SERIAL_LOG_LEVEL : atoi(tmp); + SetSeriallog((!strlen(tmp)) ? SERIAL_LOG_LEVEL : atoi(tmp)); WebGetArg("l1", tmp, sizeof(tmp)); Settings.weblog_level = (!strlen(tmp)) ? WEB_LOG_LEVEL : atoi(tmp); WebGetArg("l2", tmp, sizeof(tmp)); - Settings.syslog_level = (!strlen(tmp)) ? SYS_LOG_LEVEL : atoi(tmp); - syslog_level = Settings.syslog_level; - syslog_timer = 0; + SetSyslog((!strlen(tmp)) ? SYS_LOG_LEVEL : atoi(tmp)); WebGetArg("lh", tmp, sizeof(tmp)); strlcpy(Settings.syslog_host, (!strlen(tmp)) ? SYS_LOG_HOST : tmp, sizeof(Settings.syslog_host)); WebGetArg("lp", tmp, sizeof(tmp));