From b8d263d697657376bebc7ada283cee56573080c8 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 22 Jul 2024 19:58:45 +0200 Subject: [PATCH] Use slf4j and log4j properly (#27) ## Description We used log4j2 as a default logger, but also provided slf4j api that had to be implemented in the code that uses data-generator. This should resolve the problems. ## Type of Change * Bug fix (non-breaking change which fixes an issue) ## Checklist - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code Signed-off-by: Jakub Stejskal --- pom.xml | 11 ----------- .../java/io/skodjob/datagenerator/DataGenerator.java | 6 +++--- src/main/resources/log4j2.properties | 10 +++++----- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 9141ef0..3338732 100644 --- a/pom.xml +++ b/pom.xml @@ -162,11 +162,6 @@ log4j-slf4j-impl ${log4j.version} - - org.slf4j - slf4j-api - ${slf4j.version} - com.github.spotbugs spotbugs-annotations @@ -186,12 +181,6 @@ avro ${avro.version} - - - org.apache.avro - avro-tools - ${avro.version} - diff --git a/src/main/java/io/skodjob/datagenerator/DataGenerator.java b/src/main/java/io/skodjob/datagenerator/DataGenerator.java index e719a4a..3e013d4 100644 --- a/src/main/java/io/skodjob/datagenerator/DataGenerator.java +++ b/src/main/java/io/skodjob/datagenerator/DataGenerator.java @@ -13,8 +13,8 @@ import io.skodjob.datagenerator.handlers.PayrollHandler; import io.skodjob.datagenerator.handlers.StarGateHandler; import io.skodjob.datagenerator.handlers.StarWarsHandler; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Objects; @@ -22,7 +22,7 @@ * This class is responsible for generating data based on specified templates. */ public class DataGenerator { - private static final Logger LOGGER = LogManager.getLogger(DataGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DataGenerator.class); private final ETemplateType templateType; diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties index ea5af2c..52b8896 100644 --- a/src/main/resources/log4j2.properties +++ b/src/main/resources/log4j2.properties @@ -1,4 +1,4 @@ -name = TFConfig +name = DataGeneratorConfig appender.console.type = Console appender.console.name = STDOUT @@ -7,8 +7,8 @@ appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss}{GMT} [%thread] %highli appender.rolling.type = RollingFile appender.rolling.name = RollingFile -appender.rolling.fileName = ${env:TEST_LOG_DIR:-target/logs}/load-generator-debug-${env:BUILD_ID:-0}.log -appender.rolling.filePattern = ${env:TEST_LOG_DIR:-target/logs}/load-generator-debug-%d{yyyy-MM-dd-HH-mm-ss}-%i.log.gz +appender.rolling.fileName = ${env:TEST_LOG_DIR:-target/logs}/data-generator-debug-${env:BUILD_ID:-0}.log +appender.rolling.filePattern = ${env:TEST_LOG_DIR:-target/logs}/data-generator-debug-%d{yyyy-MM-dd-HH-mm-ss}-%i.log.gz appender.rolling.policies.type = Policies appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size=100MB @@ -17,9 +17,9 @@ appender.rolling.strategy.max = 5 appender.rolling.layout.type = PatternLayout appender.rolling.layout.pattern=%d{yyyy-MM-dd HH:mm:ss}{GMT} %-5p [%c{1}:%L] %m%n -rootLogger.level = ${env:TEST_ROOT_LOG_LEVEL:-DEBUG} +rootLogger.level = ${env:LOG_LEVEL:-DEBUG} rootLogger.appenderRef.console.ref = STDOUT -rootLogger.appenderRef.console.level = ${env:TEST_LOG_LEVEL:-INFO} +rootLogger.appenderRef.console.level = ${env:LOG_LEVEL:-INFO} rootLogger.appenderRef.rolling.ref = RollingFile rootLogger.appenderRef.rolling.level = DEBUG rootLogger.additivity = false