From 03251b36f5f33f5e17b450cc1d7c19bd9395b747 Mon Sep 17 00:00:00 2001 From: ahren Date: Tue, 28 Nov 2023 11:39:59 +0100 Subject: [PATCH] inkl Ohmlogger txt datei --- ohmLog2 | 15 +++++++++++++++ src/bandit/Model/Wuerfel.java | 3 ++- src/bandit/util/OhmLogger.java | 19 +++++++++++++++---- src/config.properties | 4 ++++ 4 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 ohmLog2 diff --git a/ohmLog2 b/ohmLog2 new file mode 100644 index 0000000..8a3f3cf --- /dev/null +++ b/ohmLog2 @@ -0,0 +1,15 @@ +| 2023-11-28T11:37:42.390252 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt | +| 2023-11-28T11:37:42.393278400 | INFO | bandit.Model.Zahlengenerator | Generator gestartet | +| 2023-11-28T11:37:43.136932500 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt | +| 2023-11-28T11:37:43.137930 | INFO | bandit.Model.Zahlengenerator | Generator gestopt | +| 2023-11-28T11:37:43.143407 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 522 | +| 2023-11-28T11:38:59.188169300 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt | +| 2023-11-28T11:38:59.189224300 | INFO | bandit.Model.Zahlengenerator | Generator gestartet | +| 2023-11-28T11:39:00.790984600 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt | +| 2023-11-28T11:39:00.791922600 | INFO | bandit.Model.Zahlengenerator | Generator gestopt | +| 2023-11-28T11:39:00.800778 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 463 | +| 2023-11-28T11:39:02.989252600 | INFO | bandit.Schnittstelle.StartStopController | Start gedruekt | +| 2023-11-28T11:39:02.990717700 | INFO | bandit.Model.Zahlengenerator | Generator gestartet | +| 2023-11-28T11:39:04.198394300 | INFO | bandit.Schnittstelle.StartStopController | Stop gedrueckt | +| 2023-11-28T11:39:04.214775 | INFO | bandit.Model.Zahlengenerator | Generator gestopt | +| 2023-11-28T11:39:04.215990800 | WARNING | bandit.Model.Zahlengenerator | unlucky -> 544 | diff --git a/src/bandit/Model/Wuerfel.java b/src/bandit/Model/Wuerfel.java index e63c075..5558ff5 100644 --- a/src/bandit/Model/Wuerfel.java +++ b/src/bandit/Model/Wuerfel.java @@ -68,9 +68,10 @@ public class Wuerfel implements Runnable // Callable @Override public void run() { - lg.fine("Run "+ data.getId()); + lg.fine("Run "+ data.getId()); while (true) { + while (!laufend) { synchronized (LOCK) diff --git a/src/bandit/util/OhmLogger.java b/src/bandit/util/OhmLogger.java index 57fd19b..cb7fec0 100644 --- a/src/bandit/util/OhmLogger.java +++ b/src/bandit/util/OhmLogger.java @@ -54,16 +54,27 @@ public class OhmLogger { try (InputStream configFile = OhmLogger.class.getClassLoader().getResourceAsStream("config.properties")) { if (configFile != null) { + 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); - Properties properties = new Properties(); - properties.load(configFile); - java.util.logging.Level classLogLevel = java.util.logging.Level.parse(properties.getProperty("log.level")); - lg.setLevel(classLogLevel); + String logDirectory = properties.getProperty("log.directory"); + String logFileName = properties.getProperty("log.filename"); + + 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."); diff --git a/src/config.properties b/src/config.properties index 1ed3568..2c00611 100644 --- a/src/config.properties +++ b/src/config.properties @@ -1,4 +1,8 @@ log.level=INFO + +log.directory=../Aufgabe7_bandit +log.filename=ohmLog + # Beispiel f\u00fcr verschiedene Level f\u00fcr unterschiedliche Pakete # log.level.bandit.Zahlengenerator=FINE # log.level.bandit.Model.Wuerfel=WARNING \ No newline at end of file