Cleanup, add history log back

mnellemann · Oct 15, 2024 · eca2ff0 · eca2ff0
1 parent 88387e9
commit eca2ff0
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,9 @@ dependencies {
     implementation 'info.picocli:picocli:4.7.6'
     implementation 'org.slf4j:slf4j-api:2.0.13'
     implementation 'org.slf4j:slf4j-simple:2.0.13'
-    implementation 'ro.pippo:pippo:1.14.0'
+    implementation 'ro.pippo:pippo-core:1.14.0'
+    implementation 'ro.pippo:pippo-undertow:1.14.0'
+    implementation 'ro.pippo:pippo-freemarker:1.14.0'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.4'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4'
     implementation 'org.apache.commons:commons-collections4:4.4'

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 id            = syslogd
 name          = syslogd
 group         = biz.nellemann.syslogd
-version       = 1.4.1
+version       = 1.4.2
 description   = "Syslog Director"
diff --git a/src/main/java/biz/nellemann/syslogd/Main.java b/src/main/java/biz/nellemann/syslogd/Main.java
@@ -24,6 +24,8 @@
 import java.util.Locale;
 import java.util.concurrent.Callable;
 
+import org.apache.commons.collections4.queue.CircularFifoQueue;
+
 import biz.nellemann.syslogd.msg.SyslogMessage;
 import biz.nellemann.syslogd.net.GelfClient;
 import biz.nellemann.syslogd.net.LokiClient;
@@ -46,6 +48,7 @@
         versionProvider = biz.nellemann.syslogd.VersionProvider.class)
 public class Main implements Callable<Integer>, LogReceiveListener {
 
+    private CircularFifoQueue<SyslogMessage> queue = new CircularFifoQueue<>(500);
     private final List<LogForwardListener> logForwardListeners = new ArrayList<>();
     private SyslogParser syslogParser;
     private static boolean keepRunning = true;
@@ -161,7 +164,7 @@ else if (protocol == InputProtocol.RFC5424) {
             PippoSettings settings = new PippoSettings(RuntimeMode.PROD);
             settings.overrideSetting("server.port", monitorPort);
             settings.overrideSetting("server.contextPath", monitorPath);
-            WebServer pippoApp = new WebServer(settings);
+            WebServer pippoApp = new WebServer(settings, queue);
             logForwardListeners.add(pippoApp.getLogSocketHandler());
 
             Pippo pippo = new Pippo(pippoApp);
@@ -170,6 +173,7 @@ else if (protocol == InputProtocol.RFC5424) {
         }
 
         while(keepRunning) {
+            //noinspection BusyWait
             Thread.sleep(1000);
         }
 
@@ -192,6 +196,7 @@ public void onLogEvent(LogReceiveEvent event) {
 
             if(!logForwardListeners.isEmpty()) {
                 sendForwardEvent(msg);
+                queue.add(msg);
             }
 
             if(stdout) {

diff --git a/src/main/java/biz/nellemann/syslogd/msg/SyslogMessage.java b/src/main/java/biz/nellemann/syslogd/msg/SyslogMessage.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.lang.reflect.Member;
 import java.time.Instant;
 
 @JsonIgnoreProperties(ignoreUnknown = true)

diff --git a/src/main/java/biz/nellemann/syslogd/net/LogSocketHandler.java b/src/main/java/biz/nellemann/syslogd/net/LogSocketHandler.java
@@ -22,37 +22,36 @@ public class LogSocketHandler implements WebSocketHandler, LogForwardListener {
     @Override
     public void onMessage(WebSocketContext webSocketContext, String message) {
         log.debug("onMessage() - {}", message);
-        try {
-            webSocketContext.sendMessage(message);
-        } catch (IOException e) {
-            log.warn("onMessage() - {}", message);
-        }
     }
 
+
     @Override
     public void onMessage(WebSocketContext webSocketContext, byte[] message) {
         log.debug("onMessage()");
-        System.out.println("TestWebSocket.onMessage");
     }
 
+
     @Override
     public void onOpen(WebSocketContext webSocketContext) {
         log.debug("onOpen()");
         webSocketContextList.add(webSocketContext);
     }
 
+
     @Override
     public void onClose(WebSocketContext webSocketContext, int closeCode, String message) {
         log.debug("onClose()");
         webSocketContextList.remove(webSocketContext);
     }
 
+
     @Override
     public void onTimeout(WebSocketContext webSocketContext) {
         log.debug("onTimeout()");
         webSocketContextList.remove(webSocketContext);
     }
 
+
     @Override
     public void onError(WebSocketContext webSocketContext, Throwable t) {
         log.debug("onError()");

diff --git a/src/main/java/biz/nellemann/syslogd/net/LokiClient.java b/src/main/java/biz/nellemann/syslogd/net/LokiClient.java
@@ -66,12 +66,12 @@ public void send(String msg) throws MalformedURLException {
             int responseCode = con.getResponseCode();
             try (InputStream ignored = con.getInputStream()) {
                 if(responseCode != 204) {
-                    log.warn("send() - response: " + responseCode);
+                    log.warn("send() - response: {}", responseCode);
                 }
             }
 
         } catch (IOException e) {
-            log.error("send() - error: " + e.getMessage());
+            log.error("send() - error: {}", e.getMessage());
         } finally {
             if(con != null) {
                 con.disconnect();

diff --git a/src/main/java/biz/nellemann/syslogd/net/TcpServer.java b/src/main/java/biz/nellemann/syslogd/net/TcpServer.java
@@ -37,17 +37,16 @@ public class TcpServer extends Thread {
     private final static Logger log = LoggerFactory.getLogger(TcpServer.class);
 
     private final int port;
-    private ServerSocket serverSocket;
     protected boolean listen = true;
 
     public TcpServer(int port) {
         this.port = port;
     }
 
+
     @Override
     public void run() {
-        try {
-            serverSocket = new ServerSocket(port);
+        try(ServerSocket serverSocket = new ServerSocket(port)) {
             while (listen)
                 new ClientHandler(serverSocket.accept(), eventListeners).start();
         } catch (IOException e) {

diff --git a/src/main/java/biz/nellemann/syslogd/net/UdpClient.java b/src/main/java/biz/nellemann/syslogd/net/UdpClient.java
@@ -43,7 +43,7 @@ public void send(String msg) {
         try {
             socket.send(packet);
         } catch (IOException e) {
-            log.error("send() - Could not send packet: " + e.getMessage());
+            log.error("send() - Could not send packet: {}", e.getMessage());
         }
     }
 

diff --git a/src/main/java/biz/nellemann/syslogd/net/WebServer.java b/src/main/java/biz/nellemann/syslogd/net/WebServer.java
@@ -1,38 +1,53 @@
 package biz.nellemann.syslogd.net;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.queue.CircularFifoQueue;
+
+import biz.nellemann.syslogd.SyslogPrinter;
+import biz.nellemann.syslogd.msg.SyslogMessage;
 import ro.pippo.core.Application;
 import ro.pippo.core.PippoSettings;
 
 public class WebServer extends Application {
 
-    private final static Logger log = LoggerFactory.getLogger(WebServer.class);
     private final LogSocketHandler logSocketHandler = new LogSocketHandler();
+    private CircularFifoQueue<SyslogMessage> queue;
 
-    public LogSocketHandler getLogSocketHandler() {
-        return logSocketHandler;
+    public WebServer(PippoSettings settings) {
+        super((settings));
     }
 
-    public WebServer(PippoSettings settings) {
+    public WebServer(PippoSettings settings, CircularFifoQueue<SyslogMessage> q) {
         super((settings));
+        queue = q;
     }
 
+
     @Override
     protected void onInit() {
 
         GET("/", routeContext -> routeContext.render("index"));
 
         GET("/ping", routeContext -> routeContext.send("pong"));
 
-        /*
         GET("/log", routeContext -> routeContext.text().negotiateContentType().send(
             queue.stream().sorted(Collections.reverseOrder()).map(SyslogPrinter::toHtml).collect(Collectors.joining())
-        ));*/
+        ));
 
         addWebSocket("/ws/log", logSocketHandler);
 
     }
 
 
+    public LogSocketHandler getLogSocketHandler() {
+        return logSocketHandler;
+    }
+
+
+    public void setQueue(CircularFifoQueue<SyslogMessage> q) {
+        this.queue = q;
+    }
+
 }
diff --git a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java
@@ -47,7 +47,7 @@ public class SyslogParserRfc3164 extends SyslogParser {
     @Override
     public SyslogMessage parse(final String input) throws NumberFormatException {
 
-        log.debug("parseRfc3164() " + input);
+        log.debug("parseRfc3164() {}", input);
 
         Matcher matcher = pattern.matcher(input);
         if(!matcher.find()) {
@@ -105,7 +105,7 @@ public Instant parseTimestamp(String dateString) {
             log.debug("parseTimestamp()", e);
         }
 
-        log.warn("parseTimestamp() - Could not parse timestamp: " + dateString);
+        log.warn("parseTimestamp() - Could not parse timestamp: {}", dateString);
         return Instant.now();
     }
 

diff --git a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java
@@ -15,8 +15,6 @@
  */
 package biz.nellemann.syslogd.parser;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -49,12 +47,12 @@ public class SyslogParserRfc5424 extends SyslogParser {
     @Override
     public SyslogMessage parse(final String input) throws NumberFormatException {
 
-        log.debug("parseRfc5424() " + input);
+        log.debug("parseRfc5424() {}", input);
 
         Matcher matcher = pattern.matcher(input);
         boolean matchFound = matcher.find();
         if(!matchFound) {
-            log.debug("parseRfc5424() - Match not found in: " + input);
+            log.debug("parseRfc5424() - Match not found in: {}", input);
             System.err.println("!" + input);
             return null;
         }
@@ -120,11 +118,11 @@ public Instant parseTimestamp(String dateString) {
                 return Instant.from(temporalAccessor);
             }
             catch (DateTimeParseException e) {
-                log.debug("parseTimestamp() " + e.getMessage());
+                log.debug("parseTimestamp() {}", e.getMessage());
             }
         }
 
-        log.warn("parseTimestamp() - Could not parse timestamp: " + dateString);
+        log.warn("parseTimestamp() - Could not parse timestamp: {}", dateString);
         return Instant.now();
     }