make syslog work again

lib/uuid-syslog/src/syslog.cpp

@@ -132,13 +132,17 @@ void SyslogService::log_level(uuid::log::Level level) {
         remove_queued_messages(level);
     }
 
-    static bool level_set     = false;
+    // commented out for EMS-ESP
-    bool        level_changed = !level_set || (level != log_level());
+
-    level_set                 = true;
+    /*
+    static bool level_set = false;
+    level_set             = true;
+    bool level_changed = !level_set || (level != log_level());
     
     if (level_changed) {
-        logger_.info("Log level set to %S", uuid::log::format_level_uppercase(level));
+         logger_.info("Log level set to %S", uuid::log::format_level_uppercase(level));
     }
+    */
 
     uuid::log::Logger::register_handler(this, level);
 }
@@ -170,17 +174,38 @@ size_t SyslogService::current_log_messages() const {
 }
 
 std::pair<IPAddress, uint16_t> SyslogService::destination() const {
-    return std::make_pair(host_, port_);
+    return std::make_pair(ip_, port_);
 }
 
-void SyslogService::destination(IPAddress host, uint16_t port) {
+void SyslogService::destination(IPAddress ip, uint16_t port) {
-    ip_   = host;
+    ip_   = ip;
     port_ = port;
 
     if ((uint32_t)ip_ == (uint32_t)0) {
         started_ = false;
         remove_queued_messages(log_level());
-        // host_.clear();
+        host_.clear();
+    }
+}
+
+void SyslogService::destination(const char * host, uint16_t port) {
+    if (host == nullptr || host[0] == '\0') {
+        started_ = false;
+        remove_queued_messages(log_level());
+        ip_ = (IPAddress)(uint32_t)0;
+        host_.clear();
+        return;
+    }
+    host_ = host;
+    port_ = port;
+    if (ip_.fromString(host)) {
+        host_.clear();
+        if ((uint32_t)ip_ == (uint32_t)0) {
+            started_ = false;
+            remove_queued_messages(log_level());
+        }
+    } else {
+        ip_ = (IPAddress)(uint32_t)0;
     }
 }
 
@@ -207,7 +232,7 @@ void SyslogService::mark_interval(unsigned long interval) {
 SyslogService::QueuedLogMessage::QueuedLogMessage(unsigned long id, std::shared_ptr<uuid::log::Message> && content)
     : id_(id)
     , content_(std::move(content)) {
-    // Added by proddy for EMS-ESP
+    // Added for EMS-ESP
     // check for Ethernet too. This assumes the network has already started.
     if (time_good_ || emsesp::EMSESP::system_.network_connected()) {
 #if UUID_SYSLOG_HAVE_GETTIMEOFDAY
@@ -324,25 +349,23 @@ void SyslogService::loop() {
 }
 
 bool SyslogService::can_transmit() {
-    // TODO removed this, it was in <v3.5. Do we need to add it back? not sure what it did.
+    // TODO this should be checked for Eth
-    /*
     if (!host_.empty() && (uint32_t)ip_ == 0) {
         WiFi.hostByName(host_.c_str(), ip_);
     }
-    */
 
 #if UUID_SYSLOG_HAVE_IPADDRESS_TYPE
-    if (host_.isV4() && (uint32_t)host_ == (uint32_t)0) {
+    if (ip_.isV4() && (uint32_t)ip_ == (uint32_t)0) {
         return false;
     }
 #else
-    if ((uint32_t)host_ == (uint32_t)0) {
+    if ((uint32_t)ip_ == (uint32_t)0) {
         return false;
     }
 #endif
 
-    if (WiFi.status() != WL_CONNECTED) {
+    if (!emsesp::EMSESP::system_.network_connected()) {
-        return false;
+        return false; // added by proddy. Check Ethernet
     }
 
     const uint64_t now           = uuid::get_uptime_ms();
@@ -350,14 +373,14 @@ bool SyslogService::can_transmit() {
 
 #if UUID_SYSLOG_ARP_CHECK
 #if UUID_SYSLOG_HAVE_IPADDRESS_TYPE
-    if (host_.isV4())
+    if (ip_.isV4())
 #endif
     {
         message_delay = UUID_SYSLOG_UDP_IPV4_ARP_MESSAGE_DELAY;
     }
 #endif
 #if UUID_SYSLOG_NDP_CHECK && UUID_SYSLOG_HAVE_IPADDRESS_TYPE
-    if (host_.isV6()) {
+    if (ip_.isV6()) {
         message_delay = UUID_SYSLOG_UDP_IPV6_NDP_MESSAGE_DELAY;
     }
 #endif
@@ -368,12 +391,12 @@ bool SyslogService::can_transmit() {
 
 #if UUID_SYSLOG_ARP_CHECK
 #if UUID_SYSLOG_HAVE_IPADDRESS_TYPE
-    if (host_.isV4())
+    if (ip_.isV4())
 #endif
     {
         ip4_addr_t ipaddr;
 
-        ip4_addr_set_u32(&ipaddr, (uint32_t)host_);
+        ip4_addr_set_u32(&ipaddr, (uint32_t)ip_);
 
         if (!ip4_addr_isloopback(&ipaddr) && !ip4_addr_ismulticast(&ipaddr) && !ip4_addr_isbroadcast(&ipaddr, netif_default)) {
             struct eth_addr *  eth_ret = nullptr;
@@ -400,10 +423,10 @@ bool SyslogService::can_transmit() {
 #endif
 
 #if UUID_SYSLOG_NDP_CHECK && UUID_SYSLOG_HAVE_IPADDRESS_TYPE
-    if (host_.isV6()) {
+    if (ip_.isV6()) {
         ip6_addr_t ip6addr;
 
-        IP6_ADDR(&ip6addr, host_.raw6()[0], host_.raw6()[1], host_.raw6()[2], host_.raw6()[3]);
+        IP6_ADDR(&ip6addr, ip_.raw6()[0], ip_.raw6()[1], ip_.raw6()[2], ip_.raw6()[3]);
         ip6_addr_assign_zone(&ip6addr, IP6_UNICAST, netif_default);
 
         if (!ip6_addr_isloopback(&ip6addr) && !ip6_addr_ismulticast(&ip6addr)) {
@@ -517,7 +540,7 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
         udp_.print('-');
     }
 
-    udp_.printf_P(PSTR(" %s %s - - - "), hostname_.c_str(), (message.content_->name));
+    udp_.printf(" %s %s - - - ", hostname_.c_str(), message.content_->name);
 
     char id_c_str[15];
     snprintf(id_c_str, sizeof(id_c_str), " %lu: ", message.id_);

lib/uuid-syslog/src/uuid/syslog.h

@@ -161,6 +161,9 @@ class SyslogService : public uuid::log::Handler {
 	 */
     void destination(IPAddress host, uint16_t port = DEFAULT_PORT);
 
+    // added for EMS-ESP
+    void destination(const char * host, uint16_t port = DEFAULT_PORT);
+
     /**
 	 * Get local hostname.
 	 *
@@ -310,7 +313,6 @@ class SyslogService : public uuid::log::Handler {
     bool        started_   = false;            /*!< Flag to indicate that messages have started being transmitted. @since 1.0.0 */
     bool        level_set_ = false;            /*!< Flag to indicate that the log level has been set at least once. @since 2.2.0 */
     WiFiUDP     udp_;                          /*!< UDP client. @since 1.0.0 */
-    IPAddress   host_;                         /*!< Host to send messages to. @since 1.0.0 */
     uint16_t    port_          = DEFAULT_PORT; /*!< Port to send messages to. @since 1.0.0 */
     uint64_t    last_transmit_ = 0;            /*!< Last transmit time. @since 1.0.0 */
     std::string hostname_{'-'};                /*!< Local hostname. @since 1.0.0 */
@@ -324,7 +326,8 @@ class SyslogService : public uuid::log::Handler {
     uint64_t                    last_message_  = 0;                       /*!< Last message/mark time. @since 2.0.0 */
 
     // added by MichaelDvP for EMS-ESP
-    IPAddress     ip_; /*!< Host-IP to send messages to. @since 1.0.0 */
+    IPAddress     ip_;   /*!< Host to send messages to. @since 1.0.0 */
+    std::string   host_; /*!< Host-IP to send messages to */
     unsigned long log_message_fails_ = 0;
 };
 

src/system.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020  Paul Derbyshire
+ * Copyright 2020-2023  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -409,8 +409,8 @@ void System::start() {
     led_init(false);     // init LED
     button_init(false);  // the special button
     network_init(false); // network
-
     EMSESP::uart_init(); // start UART
+    syslog_init();       // start syslog
 }
 
 // button single click

src/web/WebStatusService.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020  Paul Derbyshire
+ * Copyright 2020-2023  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
 
     case ARDUINO_EVENT_WIFI_STA_GOT_IP:
         EMSESP::logger().info("WiFi connected with IP=%s, hostname=%s", WiFi.localIP().toString().c_str(), WiFi.getHostname());
-        EMSESP::system_.syslog_init();
+        // EMSESP::system_.syslog_init();
         mDNS_start();
         EMSESP::system_.send_info_mqtt("connected");
         break;
@@ -65,7 +65,7 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
         if (!EMSESP::system_.ethernet_connected()) {
             EMSESP::logger().info("Ethernet connected with IP=%s, speed %d Mbps", ETH.localIP().toString().c_str(), ETH.linkSpeed());
             // EMSESP::system_.send_heartbeat();
-            EMSESP::system_.syslog_init();
+            // EMSESP::system_.syslog_init();
             EMSESP::system_.ethernet_connected(true);
             mDNS_start();
             EMSESP::system_.send_info_mqtt("connected");
@@ -105,7 +105,7 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
         } else {
             EMSESP::logger().info("WiFi connected with IPv6=%s, hostname=%s", WiFi.localIPv6().toString().c_str(), WiFi.getHostname());
         }
-        EMSESP::system_.syslog_init();
+        // EMSESP::system_.syslog_init();
         mDNS_start();
         EMSESP::system_.send_info_mqtt("connected");
         break;