diff --git a/pom.xml b/pom.xml index 2cb50e3..d68e4bf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,16 @@ tomlj 1.0.0 + + org.apache.logging.log4j + log4j-api + 2.17.2 + + + org.apache.logging.log4j + log4j-core + 2.17.2 + junit junit diff --git a/src/main/java/tech/bitgoblin/App.java b/src/main/java/tech/bitgoblin/App.java index 014de3a..2d2aa97 100644 --- a/src/main/java/tech/bitgoblin/App.java +++ b/src/main/java/tech/bitgoblin/App.java @@ -23,7 +23,7 @@ public class App { Transcoder t = new Transcoder(c); Timer timer = new Timer(); timer.scheduleAtFixedRate(new RunTranscoderTask(t), 2500, ((long) c.getInt("transcoder.interval") * msToMinutes)); - System.out.printf("Starting transcoder, running in %d minute intervals.%n", c.getInt("transcoder.interval")); + Logger.logger.info(String.format("Starting transcoder, running in %d minute intervals.", c.getInt("transcoder.interval"))); } } diff --git a/src/main/java/tech/bitgoblin/Logger.java b/src/main/java/tech/bitgoblin/Logger.java new file mode 100644 index 0000000..c1d6a1a --- /dev/null +++ b/src/main/java/tech/bitgoblin/Logger.java @@ -0,0 +1,9 @@ +package tech.bitgoblin; + +import org.apache.logging.log4j.LogManager; + +public class Logger { + + public static org.apache.logging.log4j.Logger logger = LogManager.getLogger(); + +} diff --git a/src/main/java/tech/bitgoblin/config/Config.java b/src/main/java/tech/bitgoblin/config/Config.java index 99d5c06..0b0b7fe 100644 --- a/src/main/java/tech/bitgoblin/config/Config.java +++ b/src/main/java/tech/bitgoblin/config/Config.java @@ -8,6 +8,7 @@ import java.util.Objects; import org.tomlj.Toml; import org.tomlj.TomlParseResult; +import tech.bitgoblin.Logger; import tech.bitgoblin.io.IOUtils; public class Config { @@ -21,7 +22,7 @@ public class Config { try { this.parseConfig(); } catch (IOException e) { - System.out.println("Unable to read config file; please check that " + this.configPath + " is available."); + Logger.logger.info("Unable to read config file; please check that " + this.configPath + " is available."); System.exit(1); } } diff --git a/src/main/java/tech/bitgoblin/transcoder/Repository.java b/src/main/java/tech/bitgoblin/transcoder/Repository.java index e58286b..8fe28ba 100644 --- a/src/main/java/tech/bitgoblin/transcoder/Repository.java +++ b/src/main/java/tech/bitgoblin/transcoder/Repository.java @@ -1,5 +1,6 @@ package tech.bitgoblin.transcoder; +import tech.bitgoblin.Logger; import tech.bitgoblin.io.IOUtils; import java.io.File; @@ -33,7 +34,7 @@ public class Repository { // searches this ingest directory for video files public File[] searchIngest() { - System.out.println("Searching for files to transcode in " + this.ingestPath); + Logger.logger.info("Searching for files to transcode in " + this.ingestPath); File repo = new File(this.ingestPath); return repo.listFiles(); } diff --git a/src/main/java/tech/bitgoblin/transcoder/Transcoder.java b/src/main/java/tech/bitgoblin/transcoder/Transcoder.java index 42bad7f..987df64 100644 --- a/src/main/java/tech/bitgoblin/transcoder/Transcoder.java +++ b/src/main/java/tech/bitgoblin/transcoder/Transcoder.java @@ -10,6 +10,7 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.Timer; +import tech.bitgoblin.Logger; import tech.bitgoblin.config.Config; import tech.bitgoblin.io.IOUtils; @@ -46,12 +47,12 @@ public class Transcoder { // check if the ingest directory is empty if (sourceFiles.length == 0) { - System.out.println("There is nothing to transcode in ingest."); + Logger.logger.info("There is nothing to transcode in ingest."); return; } // transcode - System.out.println("Transcoding video files ingest..."); + Logger.logger.info("Transcoding video files ingest..."); for (File f : sourceFiles) { String filePath = f.toString().substring(0, f.toString().lastIndexOf(".")); String filename = Paths.get(filePath).getFileName().toString(); @@ -73,16 +74,16 @@ public class Transcoder { try { Process process = pb.start(); int ret = process.waitFor(); - System.out.printf("Program exited with code: %d\n", ret); - System.out.println(); + Logger.logger.info("Program exited with code: %d", ret); + Logger.logger.info(""); } catch (IOException | InterruptedException e) { throw new RuntimeException(e); } } // end output - System.out.println("------------ End of transcoding ------------"); - System.out.println(); + Logger.logger.info("------------ End of transcoding ------------"); + Logger.logger.info(""); } } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 0000000..af25fd4 --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n + + + + + + + + + \ No newline at end of file