From 281a82a613110c90c7f696229a4a13f0f4def121 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 22 Apr 2017 21:28:01 +0200
Subject: [PATCH] used new logger
---
.../deadlocker8/budgetmaster/main/Main.java | 38 +++++++++----------
.../main/DatabaseHandler.java | 2 +-
.../budgetmasterserver/main/Main.java | 7 +++-
3 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/main/Main.java b/src/de/deadlocker8/budgetmaster/main/Main.java
index de459fc72..8f4ddb54f 100644
--- a/src/de/deadlocker8/budgetmaster/main/Main.java
+++ b/src/de/deadlocker8/budgetmaster/main/Main.java
@@ -1,7 +1,6 @@
package de.deadlocker8.budgetmaster.main;
import java.io.File;
-import java.util.Arrays;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -12,7 +11,7 @@ import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.image.Image;
import javafx.stage.Stage;
-import logger.LogLevel;
+import logger.FileOutputMode;
import logger.Logger;
import tools.PathUtils;
@@ -46,26 +45,23 @@ public class Main extends Application
Logger.error(e);
}
}
-
- public static void main(String[] args)
- {
- if(Arrays.asList(args).contains("debug"))
- {
- Logger.setLevel(LogLevel.ALL);
- Logger.info("Running in Debug Mode");
- }
- else
- {
- Logger.setLevel(LogLevel.ERROR);
- }
-
- PathUtils.checkFolder(new File(PathUtils.getOSindependentPath() + bundle.getString("folder")));
- File logFile = new File(PathUtils.getOSindependentPath() + bundle.getString("folder") + "/error.log");
- Logger.enableFileOutput(logFile);
- Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
+ @Override
+ public void init() throws Exception
+ {
+ Parameters params = getParameters();
+ String logLevelParam = params.getNamed().get("loglevel");
+ Logger.setLevel(logLevelParam);
- launch(args);
+ File logFolder = new File(PathUtils.getOSindependentPath() + bundle.getString("folder"));
+ PathUtils.checkFolder(logFolder);
+ Logger.enableFileOutput(logFolder, System.out, System.err, FileOutputMode.COMBINED);
+
+ Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
}
-
+
+ public static void main(String[] args)
+ {
+ launch(args);
+ }
}
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
index 3d20eb6f5..cae8ee9af 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
@@ -30,7 +30,7 @@ public class DatabaseHandler
{
try
{
- this.connection = DriverManager.getConnection(settings.getDatabaseUrl() + settings.getDatabaseName() + "?useLegacyDatetimeCode=false&serverTimezone=Europe/Berlin", settings.getDatabaseUsername(), settings.getDatabasePassword());
+ this.connection = DriverManager.getConnection(settings.getDatabaseUrl() + settings.getDatabaseName() + "?useLegacyDatetimeCode=false&serverTimezone=Europe/Berlin&autoReconnect=true&wait_timeout=86400", settings.getDatabaseUsername(), settings.getDatabasePassword());
new DatabaseCreator(connection, settings);
Logger.info("Successfully initialized database (" + settings.getDatabaseUrl() + settings.getDatabaseName() + ")");
}
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java
index 995f4e11b..d2df69c2c 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Main.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java
@@ -9,8 +9,10 @@ import java.util.Locale;
import java.util.ResourceBundle;
import de.deadlocker8.budgetmasterserver.server.SparkServer;
+import logger.FileOutputMode;
import logger.LogLevel;
import logger.Logger;
+import tools.PathUtils;
public class Main
{
@@ -22,8 +24,9 @@ public class Main
Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
try
{
- File logFile = new File(Paths.get(SparkServer.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent().toFile() + "/error.log");
- Logger.enableFileOutput(logFile);
+ File logFolder = Paths.get(SparkServer.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent().toFile();
+ PathUtils.checkFolder(logFolder);
+ Logger.enableFileOutput(logFolder, System.out, System.err, FileOutputMode.COMBINED);
}
catch(URISyntaxException e1)
{
--
GitLab