nellemann
/
syslogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Update dependencies and build container.

This commit is contained in:
Mark Nellemann 2022-11-02 12:09:49 +01:00
parent 46b70502df
commit cf377adecd
7 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbucket-pipelines.yml
View File

@ -1,4 +1,4 @@
image: openjdk:8 image: eclipse-temurin:8-jdk
pipelines: pipelines:
branches: branches:

18
build.gradle
View File

@ -12,14 +12,14 @@ repositories {
} }
dependencies { dependencies {
annotationProcessor 'info.picocli:picocli-codegen:4.6.2' annotationProcessor 'info.picocli:picocli-codegen:4.6.3'
implementation 'info.picocli:picocli:4.6.3' implementation 'info.picocli:picocli:4.6.3'
implementation 'org.slf4j:slf4j-api:1.7.36' implementation 'org.slf4j:slf4j-api:2.0.3'
implementation 'org.slf4j:slf4j-simple:1.7.36' implementation 'org.slf4j:slf4j-simple:2.0.3'
testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
testImplementation 'org.slf4j:slf4j-api:1.7.36' testImplementation 'org.slf4j:slf4j-api:2.0.3'
testRuntimeOnly('org.slf4j:slf4j-simple:1.7.36') testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.3'
} }
application { application {
@ -80,5 +80,7 @@ jar {
} }
} }
sourceCompatibility = 1.8 java {
targetCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8
}

2
gradle.properties
View File

@ -1,3 +1,3 @@
id = syslogd id = syslogd
group = biz.nellemann.syslogd group = biz.nellemann.syslogd
version = 1.2.6 version = 1.2.7

3
src/main/java/biz/nellemann/syslogd/Application.java
View File

@ -20,7 +20,6 @@ import biz.nellemann.syslogd.net.*;
import biz.nellemann.syslogd.parser.SyslogParser; import biz.nellemann.syslogd.parser.SyslogParser;
import biz.nellemann.syslogd.parser.SyslogParserRfc3164; import biz.nellemann.syslogd.parser.SyslogParserRfc3164;
import biz.nellemann.syslogd.parser.SyslogParserRfc5424; import biz.nellemann.syslogd.parser.SyslogParserRfc5424;
import org.slf4j.impl.SimpleLogger;
import picocli.CommandLine; import picocli.CommandLine;
import picocli.CommandLine.Command; import picocli.CommandLine.Command;
@ -79,7 +78,7 @@ public class Application implements Callable<Integer>, LogReceiveListener {
if(enableDebug) { if(enableDebug) {
System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG"); System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "DEBUG");
} }
if(rfc5424) { if(rfc5424) {

3
src/main/java/biz/nellemann/syslogd/LogReceiveEvent.java
View File

@ -15,9 +15,6 @@
*/ */
package biz.nellemann.syslogd; package biz.nellemann.syslogd;
import biz.nellemann.syslogd.msg.SyslogMessage;
import java.util.EventObject; import java.util.EventObject;
public class LogReceiveEvent extends EventObject { public class LogReceiveEvent extends EventObject {

13
src/main/java/biz/nellemann/syslogd/parser/SyslogParser.java
View File

@ -16,16 +16,10 @@
package biz.nellemann.syslogd.parser; package biz.nellemann.syslogd.parser;
import biz.nellemann.syslogd.msg.SyslogMessage; import biz.nellemann.syslogd.msg.SyslogMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.time.Instant; import java.time.Instant;
public abstract class SyslogParser { public abstract class SyslogParser {
private final static Logger log = LoggerFactory.getLogger(SyslogParser.class);
public abstract SyslogMessage parse(final String input); public abstract SyslogMessage parse(final String input);
public abstract Instant parseTimestamp(final String dateString); public abstract Instant parseTimestamp(final String dateString);
@ -38,11 +32,8 @@ public abstract class SyslogParser {
* @return * @return
*/ */
public int getFacility(String pri) { public int getFacility(String pri) {
int priority = Integer.parseInt(pri); int priority = Integer.parseInt(pri);
int facility = priority >> 3; int facility = priority >> 3;
//log.debug("getFacility() - " + pri + " => " + facility);
return facility; return facility;
} }
@ -54,13 +45,9 @@ public abstract class SyslogParser {
* @return * @return
*/ */
public int getSeverity(String pri) { public int getSeverity(String pri) {
int priority = Integer.parseInt(pri); int priority = Integer.parseInt(pri);
int severity = priority & 0x07; int severity = priority & 0x07;
//log.debug("getSeverity() - " + pri + " => " + severity);
return severity; return severity;
} }
} }

2
src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java
View File

@ -21,11 +21,9 @@ import biz.nellemann.syslogd.msg.SyslogMessage;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.*; import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;