Skip to content

Commit

Permalink
Use slf4j and log4j properly (#27)
Browse files Browse the repository at this point in the history
## 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 <[email protected]>
  • Loading branch information
Frawless authored Jul 22, 2024
1 parent 58b0382 commit b8d263d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 19 deletions.
11 changes: 0 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
Expand All @@ -186,12 +181,6 @@
<artifactId>avro</artifactId>
<version>${avro.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.avro/avro-tools -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-tools</artifactId>
<version>${avro.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/skodjob/datagenerator/DataGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
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;

/**
* 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;

Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/log4j2.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name = TFConfig
name = DataGeneratorConfig

appender.console.type = Console
appender.console.name = STDOUT
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b8d263d

Please sign in to comment.