Skip to content
Snippets Groups Projects
Commit f28f1057 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

used new logger

parent 5f1e0190
Branches
Tags
1 merge request!104merge v_1_2_0 into master
package de.deadlocker8.budgetmaster.main; package de.deadlocker8.budgetmaster.main;
import java.io.File; import java.io.File;
import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
...@@ -12,7 +11,7 @@ import javafx.scene.Parent; ...@@ -12,7 +11,7 @@ import javafx.scene.Parent;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.stage.Stage; import javafx.stage.Stage;
import logger.LogLevel; import logger.FileOutputMode;
import logger.Logger; import logger.Logger;
import tools.PathUtils; import tools.PathUtils;
...@@ -47,25 +46,22 @@ public class Main extends Application ...@@ -47,25 +46,22 @@ public class Main extends Application
} }
} }
public static void main(String[] args) @Override
{ public void init() throws Exception
if(Arrays.asList(args).contains("debug"))
{
Logger.setLevel(LogLevel.ALL);
Logger.info("Running in Debug Mode");
}
else
{ {
Logger.setLevel(LogLevel.ERROR); Parameters params = getParameters();
} String logLevelParam = params.getNamed().get("loglevel");
Logger.setLevel(logLevelParam);
PathUtils.checkFolder(new File(PathUtils.getOSindependentPath() + bundle.getString("folder"))); File logFolder = new File(PathUtils.getOSindependentPath() + bundle.getString("folder"));
File logFile = new File(PathUtils.getOSindependentPath() + bundle.getString("folder") + "/error.log"); PathUtils.checkFolder(logFolder);
Logger.enableFileOutput(logFile); 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")); 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); launch(args);
} }
} }
\ No newline at end of file
...@@ -10,6 +10,7 @@ import java.util.Locale; ...@@ -10,6 +10,7 @@ import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import de.deadlocker8.budgetmasterserver.server.SparkServer; import de.deadlocker8.budgetmasterserver.server.SparkServer;
import logger.FileOutputMode;
import logger.LogLevel; import logger.LogLevel;
import logger.Logger; import logger.Logger;
...@@ -23,8 +24,8 @@ public class Main ...@@ -23,8 +24,8 @@ public class Main
Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date")); Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
try try
{ {
File logFile = new File(Paths.get(SparkServer.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent().toFile() + "/error.log"); File logFolder = Paths.get(SparkServer.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent().toFile();
Logger.enableFileOutput(logFile); Logger.enableFileOutput(logFolder, System.out, System.err, FileOutputMode.COMBINED);
} }
catch(URISyntaxException e1) catch(URISyntaxException e1)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment