Skip to content

Commit 37c0d2d

Browse files
logging: exchanged custom logger with tinylog
1 parent ad3cd6d commit 37c0d2d

25 files changed

Lines changed: 38 additions & 182 deletions

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,10 @@
120120
<artifactId>zip4j</artifactId>
121121
<version>2.10.0</version>
122122
</dependency>
123+
<dependency>
124+
<groupId>org.tinylog</groupId>
125+
<artifactId>tinylog-impl</artifactId>
126+
<version>2.6.1</version>
127+
</dependency>
123128
</dependencies>
124129
</project>

src/main/java/org/variantsync/vevos/simulation/VEVOS.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import de.ovgu.featureide.fm.core.configuration.*;
55
import de.ovgu.featureide.fm.core.io.sxfm.SXFMFormat;
66
import de.ovgu.featureide.fm.core.io.xml.XmlFeatureModelFormat;
7-
import org.variantsync.vevos.simulation.util.Logger;
7+
import org.tinylog.Logger;
88

99
public final class VEVOS {
1010
private static boolean initialized = false;
@@ -31,7 +31,6 @@ private static void InitFeatureIDE() {
3131

3232
public static void Initialize() {
3333
if (!initialized) {
34-
Logger.initConsoleLogger();
3534
InitFeatureIDE();
3635
initialized = true;
3736
Logger.debug("Finished initialization");

src/main/java/org/variantsync/vevos/simulation/examples/GenerationExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.variantsync.vevos.simulation.io.Resources;
1616
import org.variantsync.vevos.simulation.repository.BusyboxRepository;
1717
import org.variantsync.vevos.simulation.repository.SPLRepository;
18-
import org.variantsync.vevos.simulation.util.Logger;
18+
import org.tinylog.Logger;
1919
import org.variantsync.vevos.simulation.util.io.CaseSensitivePath;
2020
import org.variantsync.vevos.simulation.variability.EvolutionStep;
2121
import org.variantsync.vevos.simulation.variability.SPLCommit;

src/main/java/org/variantsync/vevos/simulation/examples/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.variantsync.vevos.simulation.io.Resources;
1212
import org.variantsync.vevos.simulation.io.data.VariabilityDatasetLoader;
1313
import org.variantsync.vevos.simulation.repository.AbstractSPLRepository;
14-
import org.variantsync.vevos.simulation.util.Logger;
14+
import org.tinylog.Logger;
1515
import org.variantsync.vevos.simulation.variability.EvolutionStep;
1616
import org.variantsync.vevos.simulation.variability.SPLCommit;
1717
import org.variantsync.vevos.simulation.variability.VariabilityDataset;

src/main/java/org/variantsync/vevos/simulation/examples/VEVOSBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.variantsync.vevos.simulation.repository.BusyboxRepository;
1515
import org.variantsync.vevos.simulation.repository.SPLRepository;
1616
import org.variantsync.vevos.simulation.util.Clock;
17-
import org.variantsync.vevos.simulation.util.Logger;
17+
import org.tinylog.Logger;
1818
import org.variantsync.vevos.simulation.util.io.CaseSensitivePath;
1919
import org.variantsync.vevos.simulation.variability.EvolutionStep;
2020
import org.variantsync.vevos.simulation.variability.SPLCommit;

src/main/java/org/variantsync/vevos/simulation/feature/config/SimpleConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.variantsync.vevos.simulation.feature.config;
22

33
import org.prop4j.Node;
4-
import org.variantsync.vevos.simulation.util.Logger;
4+
import org.tinylog.Logger;
55

66
import java.util.HashMap;
77
import java.util.List;

src/main/java/org/variantsync/vevos/simulation/io/Resources.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.variantsync.vevos.simulation.io.kernelhaven.KernelHavenSPLPCIO;
1616
import org.variantsync.vevos.simulation.io.kernelhaven.KernelHavenVariantPCIO;
1717
import org.variantsync.vevos.simulation.io.kernelhaven.VariabilityModelLoader;
18-
import org.variantsync.vevos.simulation.util.Logger;
18+
import org.tinylog.Logger;
1919
import org.variantsync.vevos.simulation.variability.VariabilityDataset;
2020
import org.variantsync.vevos.simulation.variability.pc.Artefact;
2121

src/main/java/org/variantsync/vevos/simulation/io/TextIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.variantsync.vevos.simulation.io;
22

33
import org.variantsync.functjonal.Result;
4-
import org.variantsync.vevos.simulation.util.Logger;
4+
import org.tinylog.Logger;
55

66
import java.io.BufferedReader;
77
import java.io.File;

src/main/java/org/variantsync/vevos/simulation/io/data/VariabilityDatasetLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.variantsync.functjonal.Result;
66
import org.variantsync.vevos.simulation.io.ResourceLoader;
77
import org.variantsync.vevos.simulation.io.TextIO;
8-
import org.variantsync.vevos.simulation.util.Logger;
8+
import org.tinylog.Logger;
99
import org.variantsync.vevos.simulation.variability.SPLCommit;
1010
import org.variantsync.vevos.simulation.variability.VariabilityDataset;
1111

@@ -66,7 +66,7 @@ public Result<VariabilityDataset, Exception> load(final Path p) {
6666
List<String> errorIds = new ArrayList<>();
6767
List<String> partialSuccessIds = new ArrayList<>();
6868

69-
Logger.status("Started loading of dataset under " + p);
69+
Logger.info("Started loading of dataset under " + p);
7070
final Path successFile = p.resolve(SUCCESS_COMMIT_FILE);
7171
if (Files.exists(successFile)) {
7272
successIds = TextIO.readLinesTrimmed(successFile).expect("Success-commit file exists but could not be loaded.");

src/main/java/org/variantsync/vevos/simulation/io/kernelhaven/KernelHavenPCIO.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.variantsync.vevos.simulation.io.ResourceWriter;
1010
import org.variantsync.vevos.simulation.io.Resources;
1111
import org.variantsync.vevos.simulation.io.data.CSV;
12-
import org.variantsync.vevos.simulation.util.Logger;
12+
import org.tinylog.Logger;
1313
import org.variantsync.vevos.simulation.util.fide.bugfix.FixTrueFalse;
1414
import org.variantsync.vevos.simulation.util.io.CaseSensitivePath;
1515
import org.variantsync.vevos.simulation.util.io.PathUtils;
@@ -49,7 +49,7 @@ public Result<Artefact, Exception> load(final Path csvPath) {
4949
try {
5050
csv = Resources.Instance().load(CSV.class, csvPath);
5151
} catch (final Resources.ResourceIOException resourceFailure) {
52-
Logger.warning("Was not able to load csv file: " + resourceFailure);
52+
Logger.warn("Was not able to load csv file: " + resourceFailure);
5353
return Result.Failure(resourceFailure);
5454
}
5555

@@ -78,7 +78,7 @@ public Result<Artefact, Exception> load(final Path csvPath) {
7878
p -> new SourceCodeFile(fileCondition, p))
7979
.addTrace(createAnnotation(blockCondition, startLine, endLine));
8080
} catch (final Exception e) {
81-
Logger.warning("Was not able to parse csv file: " + e);
81+
Logger.warn("Was not able to parse csv file: " + e);
8282
return Result.Failure(e);
8383
}
8484
}

0 commit comments

Comments
 (0)