diff --git a/CHANGELOG.md b/CHANGELOG.md index 7053eb365..bc0f2e791 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. - Java 9+ support - Chinese translation updated - Enable bulk replace for single typed tags +- Option to use logging configuration file (ffdec home / logging.properties) ### Removed - Due to Java9+ limited support of reflection, following features were removed: diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java index af64fbc66..a9ae5e3d8 100644 --- a/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/src/com/jpexs/decompiler/flash/gui/Main.java @@ -77,6 +77,7 @@ import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FilenameFilter; import java.io.IOException; @@ -106,6 +107,7 @@ import java.util.logging.FileHandler; import java.util.logging.Formatter; import java.util.logging.Handler; import java.util.logging.Level; +import java.util.logging.LogManager; import java.util.logging.Logger; import java.util.logging.SimpleFormatter; import java.util.regex.Matcher; @@ -2357,6 +2359,16 @@ public class Main { } public static void initLogging(boolean debug) { + File loggingFile = new File(Configuration.getFFDecHome() + "/logging.properties"); + if (loggingFile.exists()) { //use manual configuration file + final LogManager logManager = LogManager.getLogManager(); + try { + logManager.readConfiguration(new FileInputStream(loggingFile)); + return; + } catch (IOException ex) { + //ignore + } + } try { Logger logger = Logger.getLogger(""); logger.setLevel(Configuration.logLevel);