From 4875136ebc7d0ec569ebab301a3fb8e7389d917f Mon Sep 17 00:00:00 2001 From: Andrey Klimov Date: Mon, 10 Sep 2018 02:20:07 +0300 Subject: [PATCH] syslog hung fixed --- lighthub/lighthub.ino.cpp | 13 ------------- lighthub/main.cpp | 30 ++++++++++++++++-------------- 2 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 lighthub/lighthub.ino.cpp diff --git a/lighthub/lighthub.ino.cpp b/lighthub/lighthub.ino.cpp deleted file mode 100644 index 7aa3b5e..0000000 --- a/lighthub/lighthub.ino.cpp +++ /dev/null @@ -1,13 +0,0 @@ -# 1 "/var/folders/kt/8psth65x03v6tw_phdhbj12r0000gn/T/tmpFdKT_0" -#include -# 1 "/Users/andrey/Documents/Arduino/lighthub/lighthub/lighthub.ino" -#include "main.h" -void setup(); -void loop(); -#line 2 "/Users/andrey/Documents/Arduino/lighthub/lighthub/lighthub.ino" -void setup(){ - setup_main(); -} -void loop(){ - loop_main(); -} \ No newline at end of file diff --git a/lighthub/main.cpp b/lighthub/main.cpp index 71fe828..d31a027 100644 --- a/lighthub/main.cpp +++ b/lighthub/main.cpp @@ -360,20 +360,22 @@ void ip_ready_config_loaded_connecting_to_broker() { #ifndef SYSLOG_DISABLE debugSerial.println("debugSerial:"); delay(100); - char *syslogServer = aJson.getArrayItem(udpSyslogArr, 0)->valuestring; - int syslogPort = aJson.getArrayItem(udpSyslogArr, 1)->valueint; - char *syslogDeviceHostname = aJson.getArrayItem(udpSyslogArr, 2)->valuestring; - char *syslogAppname = aJson.getArrayItem(udpSyslogArr, 3)->valuestring; - debugSerial.println("debugSerial:"); - debugSerial.println(syslogServer); - debugSerial.println(syslogPort); - debugSerial.println(syslogDeviceHostname); - debugSerial.println(syslogAppname); - udpSyslog.server(syslogServer, syslogPort); - udpSyslog.deviceHostname(syslogDeviceHostname); - udpSyslog.appName(syslogAppname); - udpSyslog.defaultPriority(LOG_KERN); - udpSyslog.log(LOG_INFO, "UDP Syslog initialized!"); + if (udpSyslogArr && aJson.getArraySize(udpSyslogArr)) { + char *syslogServer = aJson.getArrayItem(udpSyslogArr, 0)->valuestring; + int syslogPort = aJson.getArrayItem(udpSyslogArr, 1)->valueint; + char *syslogDeviceHostname = aJson.getArrayItem(udpSyslogArr, 2)->valuestring; + char *syslogAppname = aJson.getArrayItem(udpSyslogArr, 3)->valuestring; + debugSerial.println("debugSerial:"); + debugSerial.println(syslogServer); + debugSerial.println(syslogPort); + debugSerial.println(syslogDeviceHostname); + debugSerial.println(syslogAppname); + udpSyslog.server(syslogServer, syslogPort); + udpSyslog.deviceHostname(syslogDeviceHostname); + udpSyslog.appName(syslogAppname); + udpSyslog.defaultPriority(LOG_KERN); + udpSyslog.log(LOG_INFO, "UDP Syslog initialized!"); + } #endif if (!mqttClient.connected() && mqttArr && ((n = aJson.getArraySize(mqttArr)) > 1)) {