Don't wait to initalize WS_uplink. Added really simple logbuffer

Author: AndreasAakesson

register_plugin.cpp

@@ -41,19 +41,7 @@ void setup_uplink()
 
     auto& en0 = net::Super_stack::get<net::IP4>(0);
 
-    // already initialized
-    if(en0.is_configured())
-      {
-        uplink = std::make_unique<WS_uplink>(en0);
-      }
-    // if not, register on config event
-    else
-      {
-        en0.on_config([] (auto& inet) {
-            uplink = std::make_unique<WS_uplink>(inet);
-          });
-      }
-
+    uplink = std::make_unique<WS_uplink>(en0);
 
     OS::on_panic(uplink::on_panic);
 

ws_uplink.cpp

@@ -48,23 +48,27 @@ namespace uplink {
     : inet_{inet}, id_{inet.link_addr().to_string()},
       parser_({this, &WS_uplink::handle_transport})
   {
-    Expects(inet.ip_addr() != 0 && "Network interface not configured");
+    OS::add_stdout({this, &WS_uplink::send_log});
 
     read_config();
 
-    start(inet);
-
-    OS::add_stdout({this, &WS_uplink::send_log});
-
-    /*parser_.on_header = [](const auto& hdr) {
-      MYINFO("Header: Code: %u Len: %u", static_cast<uint8_t>(hdr.code), hdr.length);
-    };*/
+    if(inet_.is_configured())
+    {
+      start(inet);
+    }
+    // if not, register on config event
+    else
+    {
+      MYINFO("Interface not yet configured, starts when ready.");
+      inet_.on_config({this, &WS_uplink::start});
+    }
   }
 
   void WS_uplink::start(net::Inet<net::IP4>& inet) {
     MYINFO("Starting WS uplink on %s with ID: %s",
       inet.ifname().c_str(), id_.c_str());
 
+    Expects(inet.ip_addr() != 0 && "Network interface not configured");
     Expects(not config_.url.empty());
 
     if(liu::LiveUpdate::is_resumable(UPDATE_LOC))
@@ -179,6 +183,8 @@ namespace uplink {
 
     MYINFO("Websocket established");
 
+    flush_log();
+
     send_ident();
 
     send_uplink();
@@ -440,6 +446,20 @@ namespace uplink {
     {
       send_message(Transport_code::LOG, data, len);
     }
+    else
+    {
+      // buffer for later
+      logbuf_.insert(logbuf_.end(), data, data+len);
+    }
+  }
+
+  void WS_uplink::flush_log()
+  {
+    if(not logbuf_.empty())
+    {
+      send_message(Transport_code::LOG, logbuf_.data(), logbuf_.size());
+      logbuf_.clear();
+    }
   }
 
   void WS_uplink::panic(const char* why){

ws_uplink.hpp

@@ -26,6 +26,7 @@
 #include <net/ws/websocket.hpp>
 #include <liveupdate.hpp>
 #include <util/timer.hpp>
+#include <util/logger.hpp>
 
 namespace uplink {
 
@@ -53,6 +54,8 @@ class WS_uplink {
 
   void send_log(const char*, size_t);
 
+  void flush_log();
+
   void send_uplink();
 
   void update(const std::vector<char>& buffer);
@@ -83,6 +86,8 @@ class WS_uplink {
   Timer retry_timer;
   uint8_t retry_backoff = 0;
 
+  std::vector<char> logbuf_;
+
   void inject_token(http::Request& req, http::Client::Options&, const http::Client::Host)
   {
     if (not token_.empty())