From 0f1b814d61751a8808fdd4473f95f62919157e23 Mon Sep 17 00:00:00 2001 From: Christopher Liebman Date: Sun, 17 Jun 2018 06:31:35 -0700 Subject: [PATCH] cleanup syslog & devicename --- ESPNTPServer/ESPNTPServer.cpp | 5 ++--- hardware/esp8266com/esp8266 | 2 +- libraries/DLogNet | 2 +- libraries/WiFiManager | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ESPNTPServer/ESPNTPServer.cpp b/ESPNTPServer/ESPNTPServer.cpp index 9bd706d..09013ce 100644 --- a/ESPNTPServer/ESPNTPServer.cpp +++ b/ESPNTPServer/ESPNTPServer.cpp @@ -127,8 +127,7 @@ void setup() dlog.info(SETUP_TAG, F("Startup!")); - String id = "ESPNTP:" + String(ESP.getChipId(), 16); - strncpy(devicename, id.c_str(), 32); + snprintf(devicename, sizeof(devicename), "ESPNTP:%08x", ESP.getChipId()); dlog.info(SETUP_TAG, "Device name: %s", devicename); dlog.info(SETUP_TAG, F("initializing display")); @@ -182,7 +181,7 @@ void setup() if (syslog_host != nullptr && strlen(syslog_host) > 0 && syslog_port != 0) { dlog.info(SETUP_TAG, "enabling syslog: '%s:%u'", syslog_host, syslog_port); - dlog.begin(new DLogSyslogWriter("192.168.0.31", 514, devicename)); + dlog.begin(new DLogSyslogWriter(syslog_host, syslog_port, devicename)); } const char* url = wifi.getOTAURL(); const char* fp = wifi.getOTAFP(); diff --git a/hardware/esp8266com/esp8266 b/hardware/esp8266com/esp8266 index 9c5c16e..91bb97d 160000 --- a/hardware/esp8266com/esp8266 +++ b/hardware/esp8266com/esp8266 @@ -1 +1 @@ -Subproject commit 9c5c16e9c8d90c3bd21a756c3a1487f3826b6e24 +Subproject commit 91bb97ddb30082f629b3ff2c8fc992c20fbad822 diff --git a/libraries/DLogNet b/libraries/DLogNet index 26fd5f1..2a3cc65 160000 --- a/libraries/DLogNet +++ b/libraries/DLogNet @@ -1 +1 @@ -Subproject commit 26fd5f194b978ae19b5726022410b9cc86cfeb1d +Subproject commit 2a3cc650ca4d175945a19684dbd722f1f31db666 diff --git a/libraries/WiFiManager b/libraries/WiFiManager index 2d194ea..d9f3088 160000 --- a/libraries/WiFiManager +++ b/libraries/WiFiManager @@ -1 +1 @@ -Subproject commit 2d194ea518e22424d12418d8a7b36ff4406dec5c +Subproject commit d9f3088cea0e4927b7d307d4bda2ff32907615e9