Merge origin/JensV2 into JensV2

This commit is contained in:
2023-11-28 12:28:18 +01:00
2 changed files with 2 additions and 10 deletions
+1 -2
View File
@@ -11,8 +11,7 @@ import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.SubmissionPublisher;
import java.util.logging.Logger;
import bandit.util.OhmLogger;
import java.util.HashSet;
import java.util.Set;
/**
*
+1 -8
View File
@@ -8,10 +8,7 @@ package bandit.util;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
//import java.util.Properties;
import java.util.logging.*;
/**
@@ -57,15 +54,12 @@ public class OhmLogger
Properties properties = new Properties();
properties.load(configFile);
java.util.logging.Level classLogLevel = java.util.logging.Level.parse(properties.getProperty("log.level"));
ConsoleHandler ch = new ConsoleHandler();
ch.setFormatter(new OhmFormatter());
lg.setUseParentHandlers(false);
lg.getHandlers();
lg.addHandler(ch);
lg.setLevel(classLogLevel);
String logDirectory = properties.getProperty("log.directory");
@@ -74,8 +68,7 @@ public class OhmLogger
FileHandler fileHandler = new FileHandler(logDirectory + "/" + logFileName, true);
fileHandler.setFormatter(new OhmFormatter());
lg.addHandler(fileHandler);
} else {
System.err.println("Unable to find config.properties file. OhmLogger will use default settings.");
}