Update README.md

Merge pull request 'Depedency updates and cleanup.' (#1 ) from updates into main
Reviewed-on: #1
2024-05-17 07:53:25 +00:00 · 2023-11-13 12:48:20 +00:00 · 2023-11-13 13:46:11 +01:00 · 2023-10-02 14:25:33 +02:00 · 2023-02-05 14:38:54 +01:00 · 2023-01-25 08:47:31 +01:00
24 changed files with 198 additions and 200 deletions
--- a/README.md
+++ b/README.md
@ -1,107 +1,3 @@
-# Syslog Director
-
-All received messages are written to *stdout* and/or forwarded to remote logging destinations.
-
-Supported incoming message formats are:
- Syslog RFC5424 - TCP and UDP
- Syslog RFC3164 (BSD) - TCP and UDP
- Graylog GELF - TCP and UDP (compressed & chunked)
-
-Supported remote logging destinations are:
- Syslog (RFC5424 over UDP)
- Graylog (GELF over UDP)
- Grafana Loki (HTTP over TCP).
-
-This software is free to use and is licensed under the [Apache 2.0 License](LICENSE).
-
-![architecture](doc/syslogd.png)
-
-Some of my other related projects are:
-
- [hmci](https://git.data.coop/nellemann/hmci) for agent-less monitoring of IBM Power servers
- [svci](https://git.data.coop/nellemann/svci) for monitoring IBM Spectrum Virtualize (Flashsystems / Storwize / SVC)
- [sysmon](https://git.data.coop/nellemann/sysmon) for monitoring all types of servers with a small Java agent
-
-## Usage Instructions
-
- Install the syslogd package (*.deb* or *.rpm*) from [packages](https://git.data.coop/nellemann/-/packages/generic/syslogd/) or build from source.
-
-```text
-Usage: syslogd [-dhV] [--[no-]ansi] [--[no-]stdout] [--[no-]tcp] [--[no-]udp]
-               [-f=<protocol>] [-p=<num>] [--to-gelf=<uri>] [--to-loki=<url>]
-               [--to-syslog=<uri>]
-  -d, --debug               Enable debugging [default: 'false'].
-  -f, --format=<protocol>   Input format: RFC-5424, RFC-3164 or GELF [default:
-                              RFC-3164].
-  -h, --help                Show this help message and exit.
-      --[no-]ansi           Output in ANSI colors [default: true].
-      --[no-]stdout         Output messages to stdout [default: true].
-      --[no-]tcp            Listen on TCP [default: true].
-      --[no-]udp            Listen on UDP [default: true].
-  -p, --port=<num>          Listening port [default: 1514].
-      --to-gelf=<uri>       Forward to Graylog <udp://host:port>.
-      --to-loki=<url>       Forward to Grafana Loki <http://host:port>.
-      --to-syslog=<uri>     Forward to Syslog <udp://host:port> (RFC-5424).
-  -V, --version             Print version information and exit.
-```
-
-The default syslog port (514) requires you to run syslogd as root / administrator.
-Any port number above 1024 does not require privileges and can be selected with the *-p* or *--port* option.
-
-### Examples
-
-Listening on the default syslog port:
-
-```
-java -jar /path/to/syslogd-x.y.z-all.jar --port 514
-```
-
-or, if installed as a *deb* or *rpm* package:
-
-```
-/opt/syslogd/bin/syslogd --port 514
-```
-
-Forwarding messages on to another log-system on a non-standard port.
-
-```
-java -jar /path/to/syslogd-x.y.z-all.jar --to-syslog udp://remotehost:514
-```
-
-Forwarding messages to a Graylog server in GELF format.
-
-```
-java -jar /path/to/syslogd-x.y.z-all.jar --to-gelf udp://remotehost:12201
-```
-
-Forwarding to a Grafana Loki server.
-
-```
-java -jar /path/to/syslogd-x.y.z-all.jar --to-loki http://remotehost:3100
-```
-
-If you don't want any output locally (only forwarding), you can use the ```--no-stdout``` flag.
-
-
-## Notes
-
-### IBM AIX and VIO Servers
-
-Syslog messages from AIX (and IBM Power Virtual I/O Servers) can be troublesome with some logging solutions. These can be received with
-*syslogd* and then forwarded on to your preferred logging solution.
-
-### Forwarding to Grafana Loki
-
-Forwarding is currently done by making HTTP connections to the Loki API, which works fine for low volume messages, but might cause issues for large volume of messages.
-
-## Development Notes
-
-### Test Grafana Loki
-
-Run Loki and Grafana in local containers to test.
-
-```shell
-docker run --rm -d --name=loki -p 3100:3100 grafana/loki
-docker run --rm -d --name=grafana --link loki:loki -p 3000:3000 grafana/grafana:7.1.3
-```
+# Repository moved

+Please visit [github.com/mnellemann/syslogd](https://github.com/mnellemann/syslogd)
--- a/build.gradle
+++ b/build.gradle
@ -4,7 +4,7 @@ plugins {
    id 'application'
    id 'jacoco'
    id "net.nemerosa.versioning" version "2.15.1"
-    id "com.netflix.nebula.ospackage" version "10.0.0"
+    id "com.netflix.nebula.ospackage" version "11.5.0"
    id "com.github.johnrengelman.shadow" version "7.1.2"
 }

@ -13,12 +13,12 @@ repositories {
 }

 dependencies {
-    annotationProcessor 'info.picocli:picocli-codegen:4.7.0'
-    implementation 'info.picocli:picocli:4.7.0'
-    implementation 'org.slf4j:slf4j-api:2.0.6'
-    implementation 'org.slf4j:slf4j-simple:2.0.6'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.1'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1'
+    annotationProcessor 'info.picocli:picocli-codegen:4.7.5'
+    implementation 'info.picocli:picocli:4.7.5'
+    implementation 'org.slf4j:slf4j-api:2.0.9'
+    implementation 'org.slf4j:slf4j-simple:2.0.9'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
    implementation 'org.apache.commons:commons-collections4:4.4'

    testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
@ -38,7 +38,7 @@ test {
 }

 jacoco {
-    toolVersion = "0.8.8"
+    toolVersion = "0.8.10"
 }

 jacocoTestReport {
--- a/doc/aix-errlogger.md
+++ b/doc/aix-errlogger.md
@ -39,7 +39,7 @@ refresh -s syslogd

 ### Forward errlogger to the local syslog

-We configure the errloger to forward messages to the local syslog service.
+We configure the AIX [error logger](https://www.ibm.com/docs/en/aix/7.3?topic=concepts-error-logging-overview) to forward messages to the local syslog service.

 Create an odm errnotify logging template file:

--- a/doc/readme-service.md
+++ b/doc/readme-service.md
@ -1,11 +1,11 @@
-# Syslogd as a System Service
+# Syslogd as a system service

-## Systemd
+## For systemd

-Edit the **syslogd.service** and configure required options.
+To install as a systemd service, copy the [syslogd.service](syslogd.service)
+file into */etc/systemd/system/*, edit the file and configure your required options.

-To install as a systemd service, copy the **syslogd.service**
-file into */etc/systemd/system/* and enable the service:
+Enable and start the service:

 ```shell
 systemctl daemon-reload
--- a/doc/syslogd.drawio
+++ b/doc/syslogd.drawio
@ -1 +1 @@
-<mxfile host="drawio-plugin" modified="2022-12-07T07:21:50.025Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36" etag="0NRdR40T7b5zyLZSsQHk" version="20.5.3" type="embed"><diagram id="23iRSUPoRavnBvh4doch" name="Page-1"><mxGraphModel dx="1115" dy="620" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0"><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="10" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;curved=1;sketch=1;shadow=1;" parent="1" source="2" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="2" value="RFC--3164" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1"><mxGeometry x="100" y="40" width="120" height="60" as="geometry"/></mxCell><mxCell id="13" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="9" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="14" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="6" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="15" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="7" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="16" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="8" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="3" value="syslogd" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;sketch=1;rounded=1;shadow=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1"><mxGeometry x="280" y="130" width="120" height="60" as="geometry"/></mxCell><mxCell id="11" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="4" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="4" value="RFC--5424" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"><mxGeometry x="20" y="130" width="120" height="60" as="geometry"/></mxCell><mxCell id="12" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="5" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="5" value="GELF" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1"><mxGeometry x="130" y="223.5" width="120" height="60" as="geometry"/></mxCell><mxCell id="6" value="Syslog&lt;br&gt;RFC-5424" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1"><mxGeometry x="570" y="80" width="120" height="60" as="geometry"/></mxCell><mxCell id="7" value="Grafana Loki" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1"><mxGeometry x="550" y="170" width="120" height="60" as="geometry"/></mxCell><mxCell id="8" value="Graylog" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"><mxGeometry x="420" y="250" width="120" height="60" as="geometry"/></mxCell><mxCell id="9" value="Standard&lt;br&gt;Output" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#f5f5f5;strokeColor=#666666;fontColor=#333333;" parent="1" vertex="1"><mxGeometry x="410" y="30" width="120" height="60" as="geometry"/></mxCell></root></mxGraphModel></diagram></mxfile>
+<mxfile host="drawio-plugin" modified="2023-02-05T13:04:08.556Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36" etag="__kq9uG-1g-sjP8t85Xj" version="20.5.3" type="embed"><diagram id="23iRSUPoRavnBvh4doch" name="Page-1"><mxGraphModel dx="809" dy="749" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0"><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="10" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;curved=1;sketch=1;shadow=1;" parent="1" source="2" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="2" value="Syslog&lt;br&gt;RFC--3164" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1"><mxGeometry x="50" y="90" width="120" height="60" as="geometry"/></mxCell><mxCell id="13" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="9" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="14" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="6" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="15" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="7" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="16" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="3" target="8" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="3" value="syslogd" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;sketch=1;rounded=1;shadow=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1"><mxGeometry x="280" y="130" width="120" height="60" as="geometry"/></mxCell><mxCell id="11" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="4" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="4" value="Syslog&lt;br&gt;RFC--5424" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"><mxGeometry x="40" y="180" width="120" height="60" as="geometry"/></mxCell><mxCell id="12" style="edgeStyle=orthogonalEdgeStyle;curved=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;shadow=1;" parent="1" source="5" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="5" value="GELF" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1"><mxGeometry x="120" y="260" width="120" height="60" as="geometry"/></mxCell><mxCell id="6" value="Syslog&lt;br&gt;RFC-5424" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1"><mxGeometry x="570" y="80" width="120" height="60" as="geometry"/></mxCell><mxCell id="7" value="Grafana Loki" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1"><mxGeometry x="550" y="170" width="120" height="60" as="geometry"/></mxCell><mxCell id="8" value="Graylog" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"><mxGeometry x="420" y="250" width="120" height="60" as="geometry"/></mxCell><mxCell id="9" value="Standard&lt;br&gt;Output" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#f5f5f5;strokeColor=#666666;fontColor=#333333;" parent="1" vertex="1"><mxGeometry x="410" y="30" width="120" height="60" as="geometry"/></mxCell><mxCell id="17" value="Standard&lt;br&gt;Input" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;shadow=1;fillColor=#f5f5f5;strokeColor=#666666;fontColor=#333333;" vertex="1" parent="1"><mxGeometry x="180" y="30" width="90" height="60" as="geometry"/></mxCell><mxCell id="19" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;curved=1;sketch=1;shadow=1;" edge="1" parent="1" source="17" target="3"><mxGeometry relative="1" as="geometry"><mxPoint x="190" y="110" as="sourcePoint"/><mxPoint x="300" y="170" as="targetPoint"/></mxGeometry></mxCell></root></mxGraphModel></diagram></mxfile>
--- a/doc/syslogd.png
+++ b/doc/syslogd.png
--- a/gradle.properties
+++ b/gradle.properties
@ -1,5 +1,5 @@
 id            = syslogd
 name          = syslogd
 group         = biz.nellemann.syslogd
-version       = 1.3.2
+version       = 1.3.5
 description   = "Syslog Director"
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/settings.gradle
+++ b/settings.gradle
@ -1,10 +1 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.6.1/userguide/multi_project_builds.html
- */
-
 rootProject.name = 'syslogd'
--- a/src/main/java/biz/nellemann/syslogd/Application.java
+++ b/src/main/java/biz/nellemann/syslogd/Application.java
@ -15,16 +15,6 @@
 */
 package biz.nellemann.syslogd;

-import biz.nellemann.syslogd.msg.SyslogMessage;
-import biz.nellemann.syslogd.net.*;
-import biz.nellemann.syslogd.parser.GelfParser;
-import biz.nellemann.syslogd.parser.SyslogParser;
-import biz.nellemann.syslogd.parser.SyslogParserRfc3164;
-import biz.nellemann.syslogd.parser.SyslogParserRfc5424;
-
-import picocli.CommandLine;
-import picocli.CommandLine.Command;
-
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URI;
@ -34,6 +24,19 @@ import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.Callable;

+import biz.nellemann.syslogd.msg.SyslogMessage;
+import biz.nellemann.syslogd.net.GelfClient;
+import biz.nellemann.syslogd.net.LokiClient;
+import biz.nellemann.syslogd.net.TcpServer;
+import biz.nellemann.syslogd.net.UdpClient;
+import biz.nellemann.syslogd.net.UdpServer;
+import biz.nellemann.syslogd.parser.GelfParser;
+import biz.nellemann.syslogd.parser.SyslogParser;
+import biz.nellemann.syslogd.parser.SyslogParserRfc3164;
+import biz.nellemann.syslogd.parser.SyslogParserRfc5424;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
@Command(name = "syslogd",
        mixinStandardHelpOptions = true,
        versionProvider = biz.nellemann.syslogd.VersionProvider.class)
@ -58,6 +61,9 @@ public class Application implements Callable<Integer>, LogReceiveListener {
    @CommandLine.Option(names = "--no-stdout", negatable = true, description = "Output messages to stdout [default: true].", defaultValue = "true")
    private boolean stdout;

+    @CommandLine.Option(names = "--no-stdin", negatable = true, description = "Forward messages from stdin [default: true].", defaultValue = "true")
+    private boolean stdin;
+
    @CommandLine.Option(names = {"-f", "--format"}, description = "Input format: RFC-5424, RFC-3164 or GELF [default: RFC-3164].", defaultValue = "RFC-3164")
    private String protocol;

@ -77,7 +83,6 @@ public class Application implements Callable<Integer>, LogReceiveListener {
    @Override
    public Integer call() throws IOException {

-
        if(enableDebug) {
            System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "DEBUG");
        }
@ -115,6 +120,12 @@ public class Application implements Callable<Integer>, LogReceiveListener {
            t.start();
        }

+        if(stdin) {
+            InputReader inputReader = new InputReader(System.in, protocol);
+            inputReader.addEventListener(this);
+            inputReader.start();
+        }
+
        if(udpServer) {
            UdpServer udpServer = new UdpServer(port);
            udpServer.addEventListener(this);
@ -144,7 +155,7 @@ public class Application implements Callable<Integer>, LogReceiveListener {

        if(msg != null) {

-            if(logForwardListeners.size() > 0) {
+            if(!logForwardListeners.isEmpty()) {
                sendForwardEvent(msg);
            }

--- a/src/main/java/biz/nellemann/syslogd/InputReader.java
+++ b/src/main/java/biz/nellemann/syslogd/InputReader.java
@ -0,0 +1,70 @@
+package biz.nellemann.syslogd;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import biz.nellemann.syslogd.msg.SyslogMessage;
+
+public class InputReader extends Thread {
+
+    private final Scanner input;
+    private final String protocol;
+
+    public InputReader(InputStream inputStream, String protocol) {
+        input = new Scanner(inputStream);
+        this.protocol = protocol;
+    }
+
+    @Override
+    public void run() {
+
+        while(input.hasNextLine()) {
+            SyslogMessage msg = new SyslogMessage(input.nextLine());
+            msg.hostname = "localhost";
+            msg.application = "syslogd";
+
+            String payload;
+            if(protocol.equalsIgnoreCase("GELF"))
+                payload = SyslogPrinter.toGelf(msg);
+            else if (protocol.equalsIgnoreCase("RFC-5424")) {
+                payload = SyslogPrinter.toRfc5424(msg);
+            } else {
+                payload = SyslogPrinter.toRfc3164(msg);
+            }
+
+            sendEvent(payload);
+        }
+        input.close();
+    }
+
+
+    private synchronized void sendEvent(String text) {
+        LogReceiveEvent event = new LogReceiveEvent( this, text);
+        for (LogReceiveListener eventListener : eventListeners) {
+            eventListener.onLogEvent(event);
+        }
+    }
+
+
+    /**
+     * Event Listener Configuration
+     */
+
+    protected List<LogReceiveListener> eventListeners = new ArrayList<>();
+
+    public synchronized void addEventListener(LogReceiveListener listener ) {
+        eventListeners.add( listener );
+    }
+
+    public synchronized void addEventListener(List<LogReceiveListener> listeners ) {
+        eventListeners.addAll(listeners);
+    }
+
+    public synchronized void removeEventListener( LogReceiveListener l ) {
+        eventListeners.remove( l );
+    }
+
+
+}
--- a/src/main/java/biz/nellemann/syslogd/LogReceiveEvent.java
+++ b/src/main/java/biz/nellemann/syslogd/LogReceiveEvent.java
@ -23,15 +23,13 @@ import java.util.EventObject;
 public class LogReceiveEvent extends EventObject {

    private static final long serialVersionUID = 1L;
-    //private final String message;
    private final DatagramPacket packet;

-    /*
    public LogReceiveEvent(final Object source, final String message ) {
        super( source );
-        this.message = message;
+        byte[] bytes = message.getBytes();
+        this.packet = new DatagramPacket(bytes, bytes.length);
    }
-    */

    public LogReceiveEvent(final Object source, final DatagramPacket packet) {
        super( source );
--- a/src/main/java/biz/nellemann/syslogd/msg/SyslogMessage.java
+++ b/src/main/java/biz/nellemann/syslogd/msg/SyslogMessage.java
@ -36,7 +36,7 @@ public class SyslogMessage {

    // The TIMESTAMP field is a formalized timestamp derived from [RFC3339].
    @JsonProperty("timestamp")  // 1670357783.694 - in GELF: seconds since UNIX epoch with optional decimal places for milliseconds
-    public Instant timestamp;
+    public Instant timestamp = Instant.now();

    // The HOSTNAME field identifies the machine that originally sent the syslog message.
    @JsonProperty("host")
--- a/src/main/java/biz/nellemann/syslogd/net/GelfClient.java
+++ b/src/main/java/biz/nellemann/syslogd/net/GelfClient.java
@ -1,13 +1,14 @@
 package biz.nellemann.syslogd.net;

-import biz.nellemann.syslogd.LogForwardEvent;
-import biz.nellemann.syslogd.SyslogPrinter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.net.InetSocketAddress;
 import java.net.SocketException;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import biz.nellemann.syslogd.LogForwardEvent;
+import biz.nellemann.syslogd.SyslogPrinter;
+
 public class GelfClient extends UdpClient {

    private final static Logger log = LoggerFactory.getLogger(GelfClient.class);
--- a/src/main/java/biz/nellemann/syslogd/net/LokiClient.java
+++ b/src/main/java/biz/nellemann/syslogd/net/LokiClient.java
@ -15,19 +15,22 @@
 */
 package biz.nellemann.syslogd.net;

-import biz.nellemann.syslogd.LogForwardEvent;
-import biz.nellemann.syslogd.LogForwardListener;
-import biz.nellemann.syslogd.SyslogPrinter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ArrayBlockingQueue;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import biz.nellemann.syslogd.LogForwardEvent;
+import biz.nellemann.syslogd.LogForwardListener;
+import biz.nellemann.syslogd.SyslogPrinter;
+
 public class LokiClient implements LogForwardListener, Runnable {

    private final static Logger log = LoggerFactory.getLogger(LokiClient.class);
@ -84,7 +87,7 @@ public class LokiClient implements LogForwardListener, Runnable {
        while (true) {
            try {
                send(blockingQueue.take());
-            } catch (Exception e) {
+            } catch (MalformedURLException | InterruptedException e) {
                log.warn(e.getMessage());
            }
        }
--- a/src/main/java/biz/nellemann/syslogd/net/UdpServer.java
+++ b/src/main/java/biz/nellemann/syslogd/net/UdpServer.java
@ -15,9 +15,6 @@
 */
 package biz.nellemann.syslogd.net;

-import biz.nellemann.syslogd.LogReceiveEvent;
-import biz.nellemann.syslogd.LogReceiveListener;
-
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
@ -27,6 +24,9 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import biz.nellemann.syslogd.LogReceiveEvent;
+import biz.nellemann.syslogd.LogReceiveListener;
+
 public class UdpServer extends Thread {

    private final static Logger log = LoggerFactory.getLogger(UdpServer.class);
@ -38,6 +38,7 @@ public class UdpServer extends Thread {
        socket = new DatagramSocket(port);
    }

+    @Override
    public void run() {

        byte[] buf = new byte[8192];
@ -48,7 +49,7 @@ public class UdpServer extends Thread {
                socket.receive(packet);
                //String packetData = new String(packet.getData(), packet.getOffset(), packet.getLength(), StandardCharsets.UTF_8);
                sendEvent(packet);
-            } catch (Exception e) {
+            } catch (IOException e) {
                log.error("run() - error: {}", e.getMessage());
                listen = false;
            }
--- a/src/main/java/biz/nellemann/syslogd/parser/GelfParser.java
+++ b/src/main/java/biz/nellemann/syslogd/parser/GelfParser.java
@ -1,17 +1,19 @@
 package biz.nellemann.syslogd.parser;

-import biz.nellemann.syslogd.msg.SyslogMessage;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.apache.commons.collections4.map.PassiveExpiringMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.TreeMap;

+import org.apache.commons.collections4.map.PassiveExpiringMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import biz.nellemann.syslogd.msg.SyslogMessage;
+
 /*
    For more information about the GELF format, visit:  https://go2docs.graylog.org/5-0/getting_in_log_data/gelf.html
 */
--- a/src/main/java/biz/nellemann/syslogd/parser/JsonUtil.java
+++ b/src/main/java/biz/nellemann/syslogd/parser/JsonUtil.java
@ -8,6 +8,10 @@ public class JsonUtil {

    public static String encode(String input) {

+        if(input == null) {
+            return "";
+        }
+
        StringBuilder output = new StringBuilder();

        for (int i = 0; i < input.length(); i++) {
--- a/src/main/java/biz/nellemann/syslogd/parser/SyslogParser.java
+++ b/src/main/java/biz/nellemann/syslogd/parser/SyslogParser.java
@ -15,15 +15,16 @@
 */
 package biz.nellemann.syslogd.parser;

-import biz.nellemann.syslogd.msg.SyslogMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import biz.nellemann.syslogd.msg.SyslogMessage;
+
 public abstract class SyslogParser {

    private final static Logger log = LoggerFactory.getLogger(SyslogParser.class);
@ -73,7 +74,7 @@ public abstract class SyslogParser {
            Inflater decompressor = new Inflater();
            decompressor.setInput(data, 0, data.length);
            //byte[] result = new byte[data.length * 2];
-            int resultLength = decompressor.inflate(result);
+            decompressor.inflate(result);
            decompressor.end();

            // Decode the bytes into a String
--- a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java
+++ b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java
@ -15,23 +15,26 @@
 */
 package biz.nellemann.syslogd.parser;

-import biz.nellemann.syslogd.msg.Facility;
-import biz.nellemann.syslogd.msg.Severity;
-import biz.nellemann.syslogd.msg.SyslogMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.*;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import biz.nellemann.syslogd.msg.Facility;
+import biz.nellemann.syslogd.msg.Severity;
+import biz.nellemann.syslogd.msg.SyslogMessage;
+
 public class SyslogParserRfc3164 extends SyslogParser {

    private final static Logger log = LoggerFactory.getLogger(SyslogParserRfc3164.class);

-    private final Pattern pattern = Pattern.compile("^<(\\d{1,3})>(\\D{3}\\s+\\d{1,2} \\d{2}:\\d{2}:\\d{2})\\s+(Message forwarded from \\S+:|\\S+)\\s+([^\\s:]+):?\\s+(.*)", Pattern.CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("^<(\\d{1,3})>(\\D{3}\\s+\\d{1,2} \\d{2}:\\d{2}:\\d{2})\\s+(Message forwarded from \\S+:|\\S+:?)\\s+([^\\s:]+):?\\s+(.*)", Pattern.CASE_INSENSITIVE);
    private final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy MMM [ ]d HH:mm:ss").withZone(ZoneId.systemDefault());

    /**
@ -89,6 +92,7 @@ public class SyslogParserRfc3164 extends SyslogParser {
     * @param dateString
     * @return
     */
+    @Override
    public Instant parseTimestamp(String dateString) {

        // We need to add current year to parse date correctly
--- a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java
+++ b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java
@ -15,25 +15,26 @@
 */
 package biz.nellemann.syslogd.parser;

-import biz.nellemann.syslogd.msg.Severity;
-import biz.nellemann.syslogd.msg.Facility;
-import biz.nellemann.syslogd.msg.SyslogMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.*;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import biz.nellemann.syslogd.msg.Facility;
+import biz.nellemann.syslogd.msg.Severity;
+import biz.nellemann.syslogd.msg.SyslogMessage;
+
 public class SyslogParserRfc5424 extends SyslogParser {

    private final static Logger log = LoggerFactory.getLogger(SyslogParserRfc5424.class);

-    private final Pattern pattern = Pattern.compile("^<(\\d{1,3})>(\\d+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\[.*\\]|-)\\s+(\\S+)", Pattern.CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("^<(\\d{1,3})>(\\d+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\[.*\\]|-)\\s+(.*)", Pattern.CASE_INSENSITIVE);

    /**
     * Parses [rfc5424](https://tools.ietf.org/html/rfc5424) syslog messages.
@ -98,6 +99,7 @@ public class SyslogParserRfc5424 extends SyslogParser {
     * @param dateString
     * @return
     */
+    @Override
    public Instant parseTimestamp(String dateString) {

        /*
--- a/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc3164Test.groovy
+++ b/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc3164Test.groovy
@ -50,13 +50,13 @@ class SyslogParserRfc3164Test extends Specification {
    void "test rfc3164 normal message"() {

        setup:
-        def input = "<13>Sep 23 08:53:28 xps13 mark: adfdfdf3432434"
+        def input = "<13>Sep 23 08:53:28 xps13 mark: adfdfdf3432434 abcdefghijklmnopqrstuvwxyz"

        when:
        SyslogMessage msg = syslogParser.parse(input)

        then:
-        msg.message == "adfdfdf3432434"
+        msg.message == "adfdfdf3432434 abcdefghijklmnopqrstuvwxyz"
        msg.hostname == "xps13"
        msg.application == "mark"
    }
--- a/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc5424Test.groovy
+++ b/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc5424Test.groovy
@ -40,6 +40,7 @@ class SyslogParserRfc5424Test extends Specification {
        msg.application == "su"
        msg.messageId == "ID47"
        msg.processId == null
+        msg.message == "BOM'su root' failed for lonvick on /dev/pts/8"
    }

    void "test rfc5424 example2 message"() {
--- a/src/test/groovy/biz/nellemann/syslogd/SyslogPrinterTest.groovy
+++ b/src/test/groovy/biz/nellemann/syslogd/SyslogPrinterTest.groovy
@ -10,10 +10,23 @@ class SyslogPrinterTest extends Specification {
    void setup() {
    }

+    void "to plain"() {
+        setup:
+        SyslogParser syslogParser = new SyslogParserRfc5424();
+        String input = '<13>1 2020-09-23T08:57:30.950699+02:00 xps13 mark - - [exampleSDID@32473 iut="3" eventSource="Application" eventID="1011"] adfdfdf3432434565656 abcdefghijklmnopqrstuvwxyz'
+        SyslogMessage msg = syslogParser.parse(input)
+
+        when:
+        String output = SyslogPrinter.toString(msg)
+
+        then:
+        output.endsWith("abcdefghijklmnopqrstuvwxyz")
+    }
+
    void "test toGelf"() {
        setup:
        SyslogParser syslogParser = new SyslogParserRfc5424();
-        String input = '<13>1 2020-09-23T08:57:30.950699+02:00 xps13 mark - - [exampleSDID@32473 iut="3" eventSource="Application" eventID="1011"] adfdfdf3432434565656'
+        String input = '<13>1 2020-09-23T08:57:30.950699+02:00 xps13 mark - - [exampleSDID@32473 iut="3" eventSource="Application" eventID="1011"] adfdfdf3432434565656 abcdefghijklmnopqrstuvwxyz'
        SyslogMessage msg = syslogParser.parse(input)

        when:
@ -26,14 +39,14 @@ class SyslogPrinterTest extends Specification {
    void "test toLoki"() {
        setup:
        SyslogParser syslogParser = new SyslogParserRfc5424();
-        String input = '<13>1 2020-09-23T08:57:30.950699+02:00 xps13 mark - - [exampleSDID@32473 iut="3" eventSource="Application" eventID="1011"] adfdfdf3432434565656'
+        String input = '<13>1 2020-09-23T08:57:30.950699+02:00 xps13 mark - - [exampleSDID@32473 iut="3" eventSource="Application" eventID="1011"] adfdfdf3432434565656 abcdefghijklmnopqrstuvwxyz'
        SyslogMessage msg = syslogParser.parse(input)

        when:
        String output = SyslogPrinter.toLoki(msg)

        then:
-        output == '{ "streams": [ { "stream": { "hostname": "xps13", "facility": "user", "level": "notice", "application": "mark"}, "values": [ [ "1600845200000000000", "[user.notice] xps13 mark adfdfdf3432434565656" ] ] } ] }'
+        output == '{ "streams": [ { "stream": { "hostname": "xps13", "facility": "user", "level": "notice", "application": "mark"}, "values": [ [ "1600845200000000000", "[user.notice] xps13 mark adfdfdf3432434565656 abcdefghijklmnopqrstuvwxyz" ] ] } ] }'
    }

 }
Author	SHA1	Message	Date
Mark Nellemann	3ef961e44b	Update README.md	2024-05-17 07:53:25 +00:00
Mark Nellemann	bd5e2634d5	Merge pull request 'Depedency updates and cleanup.' (#1 ) from updates into main continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details Reviewed-on: #1	2023-11-13 12:48:20 +00:00
Mark Nellemann	1acdd6a93d	Cleanup. continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-11-13 13:46:11 +01:00
Mark Nellemann	d39837861f	Update dependencies and gradle.	2023-10-02 14:25:33 +02:00
Mark Nellemann	422f1fbb71	Read from stdin and forward. continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2023-02-05 14:38:54 +01:00
Mark Nellemann	d3589faf9e	Fix syslog message parsing error resulting in messages being cut at first whitespace. continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2023-01-25 08:47:31 +01:00