Runtime setting of logback lines

Author: GuLinux

src/asyncbufferedtcplogger.cpp

@@ -3,9 +3,12 @@
 #include "asyncbufferedtcplogger.h"
 #include "configuration.h"
 
-APB::AsyncBufferedTCPLogger::AsyncBufferedTCPLogger(uint16_t port) : loggerServer{port} {
+APB::AsyncBufferedTCPLogger::AsyncBufferedTCPLogger(uint16_t port, uint16_t backlog_lines) : loggerServer{port}, backlog_lines{backlog_lines} {
     loggerServer.onClient([this](void *,AsyncClient *c){
       this->client = c;
+      c->onDisconnect([this](void *,AsyncClient *){
+        this->client = nullptr;
+      }, nullptr);
       if(!this->backlog.empty()) {
         c->write("==== Flushing backlog ====\n");
         while(!this->backlog.empty()) {
@@ -34,16 +37,18 @@ void APB::AsyncBufferedTCPLogger::setup() {
   });
 }
 
-#include "utils.h"
 size_t APB::AsyncBufferedTCPLogger::write(uint8_t c) {
     buffer[currentPosition++] = c;
     if(c == '\n') {
-      ScopeGuard resetBuffer(std::bind(&AsyncBufferedTCPLogger::reset, this));
       if(!client) {
-        return fillBacklog();
+        fillBacklog();
+        reset();
+        return 0;
       }
       client->write(buffer.data(), currentPosition);
+      reset();
     }
+    
     return 1;
 }
 
@@ -52,12 +57,11 @@ void APB::AsyncBufferedTCPLogger::reset() {
     currentPosition = 0;
 }
 
-size_t APB::AsyncBufferedTCPLogger::fillBacklog() {
-  #if APB_NETWORK_LOGGER_BACKLOG > 0
+void APB::AsyncBufferedTCPLogger::fillBacklog() {
+  if (backlog_lines > 0) {
     backlog.push(String{buffer.data()});
-    while(backlog.size() > APB_NETWORK_LOGGER_BACKLOG) {
+    while(backlog.size() > backlog_lines) {
       backlog.pop();
     }
-  #endif
-    return 0;
+  }
 }

src/asyncbufferedtcplogger.h

@@ -7,18 +7,19 @@
 namespace APB {
 class AsyncBufferedTCPLogger: public Print {
 public:
-  AsyncBufferedTCPLogger(uint16_t port);
+  AsyncBufferedTCPLogger(uint16_t port, uint16_t backlog_lines = 0);
   void setup();
-
+  void setBacklogLines(uint16_t backlog_lines) { this->backlog_lines = backlog_lines; };
   virtual size_t write(uint8_t c);
 private:
   AsyncClient *client = nullptr;
   void reset();
-  size_t fillBacklog();
+  void fillBacklog();
   std::array<char, 1024> buffer = {0};
   std::queue<String> backlog;
   uint16_t currentPosition = 0;
   AsyncServer loggerServer;
+  uint16_t backlog_lines;
 };
 
 }

src/main.cpp

@@ -23,7 +23,7 @@
 Scheduler scheduler;
 
 
-APB::AsyncBufferedTCPLogger bufferedLogger{9911};
+APB::AsyncBufferedTCPLogger bufferedLogger{9911, APB_NETWORK_LOGGER_BACKLOG };
 
 #ifdef ONEBUTTON_USER_BUTTON_1
 OneButton userButton;

src/wifimanager.cpp

@@ -2,10 +2,6 @@
 #include <ArduinoLog.h>
 #include <WiFi.h>
 
-#include "time.h"
-#include "esp_sntp.h"
-
-
 #define LOG_SCOPE "APB::WiFiManager:"
 
 using namespace std::placeholders;