From 058198003b67a3fe442d868c259f934dc2d64475 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Thu, 25 Feb 2021 14:28:51 +0100 Subject: [PATCH] More narrow output of application in stdout message printer. --- build.gradle | 2 +- gradle.properties | 2 +- src/main/java/biz/nellemann/syslogd/Application.java | 1 - src/main/java/biz/nellemann/syslogd/SyslogPrinter.java | 4 ++-- src/main/java/biz/nellemann/syslogd/net/UdpClient.java | 2 +- .../biz/nellemann/syslogd/SyslogParserRfc3164Test.groovy | 1 - 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 3e86756..b3ebf81 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'application' id "com.github.johnrengelman.shadow" version "6.1.0" id "net.nemerosa.versioning" version "2.14.0" - id "nebula.ospackage" version "8.4.2" + id "nebula.ospackage" version "8.5.2" } repositories { diff --git a/gradle.properties b/gradle.properties index 04d4ace..199c37e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ id = syslogd group = biz.nellemann.syslogd -version = 1.0.12 +version = 1.0.13 diff --git a/src/main/java/biz/nellemann/syslogd/Application.java b/src/main/java/biz/nellemann/syslogd/Application.java index c2440b6..248d9b0 100644 --- a/src/main/java/biz/nellemann/syslogd/Application.java +++ b/src/main/java/biz/nellemann/syslogd/Application.java @@ -34,7 +34,6 @@ import java.util.regex.Pattern; @Command(name = "syslogd", mixinStandardHelpOptions = true, - description = "Syslog Server", versionProvider = biz.nellemann.syslogd.VersionProvider.class) public class Application implements Callable, LogListener { diff --git a/src/main/java/biz/nellemann/syslogd/SyslogPrinter.java b/src/main/java/biz/nellemann/syslogd/SyslogPrinter.java index 6c2d148..7d478fb 100644 --- a/src/main/java/biz/nellemann/syslogd/SyslogPrinter.java +++ b/src/main/java/biz/nellemann/syslogd/SyslogPrinter.java @@ -17,7 +17,7 @@ public class SyslogPrinter { StringBuilder sb = new StringBuilder(msg.timestamp.toString()); sb.append(String.format(" [%8.8s.%-6.6s] ", msg.facility, msg.severity)); sb.append(String.format(" %-16.16s ", msg.hostname)); - sb.append(String.format(" %-32.32s ", msg.application)); + sb.append(String.format(" %-16.16s ", msg.application)); sb.append(msg.message); return sb.toString(); } @@ -36,7 +36,7 @@ public class SyslogPrinter { sb.append(String.format(" [%8.8s.%-6.6s] ", msg.facility, msg.severity)).append(Ansi.RESET); sb.append(Ansi.BLUE).append(String.format(" %-16.16s ", msg.hostname)).append(Ansi.RESET); - sb.append(Ansi.CYAN).append(String.format(" %-32.32s ", msg.application)).append(Ansi.RESET); + sb.append(Ansi.CYAN).append(String.format(" %-16.16s ", msg.application)).append(Ansi.RESET); sb.append(msg.message); return sb.toString(); diff --git a/src/main/java/biz/nellemann/syslogd/net/UdpClient.java b/src/main/java/biz/nellemann/syslogd/net/UdpClient.java index 9b57cf2..69659c5 100644 --- a/src/main/java/biz/nellemann/syslogd/net/UdpClient.java +++ b/src/main/java/biz/nellemann/syslogd/net/UdpClient.java @@ -15,7 +15,7 @@ public class UdpClient { private InetAddress address; private final Integer port; - public UdpClient(String host, Integer port) throws UnknownHostException, SocketException { + public UdpClient(String host, Integer port) { try { this.address = InetAddress.getByName(host); diff --git a/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc3164Test.groovy b/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc3164Test.groovy index a215e3a..5f8057a 100644 --- a/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc3164Test.groovy +++ b/src/test/groovy/biz/nellemann/syslogd/SyslogParserRfc3164Test.groovy @@ -19,7 +19,6 @@ class SyslogParserRfc3164Test extends Specification { syslogParser = new SyslogParserRfc3164(); } - void "test rfc3164 aix/vios message"() { setup: