Skip to content

Rework logging in Endless Dream #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
seraxis wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Rework logging in Endless Dream #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions core/src/bms/player/beatoraja/MainLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import java.net.URL;
import java.nio.file.*;
import java.util.*;
import java.util.function.Consumer;
import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.SimpleFormatter;

import de.damios.guacamole.gdx.log.LoggerService;
import org.slf4j.Logger;
Expand Down Expand Up @@ -69,11 +71,8 @@ public static void main(String[] args) {
}

java.util.logging.Logger rootLogger = LogManager.getLogManager().getLogger("");
try {
rootLogger.addHandler(new FileHandler("beatoraja_log.xml"));
} catch (Throwable e) {
e.printStackTrace();
}
initialize_logging(rootLogger);


BMSPlayerMode auto = null;
for (String s : args) {
Expand Down Expand Up @@ -117,7 +116,41 @@ public static void main(String[] args) {
}
}

public static void play(Path bmsPath, BMSPlayerMode playerMode, boolean forceExit, Config config, PlayerConfig player, boolean songUpdated) {
private static void initialize_logging(java.util.logging.Logger rootLogger) {
try {
Files.createDirectories(Paths.get("./logs/"));
FileHandler fileHandler = new FileHandler("./logs/endlessdream-%g.log", 0, 10);
// There is no function to set this directly on the formatter. This is very stupid
// Set log info to plain for printing system information
System.setProperty("java.util.logging.SimpleFormatter.format", "%5$s%n");
SimpleFormatter formatter = new SimpleFormatter();
fileHandler.setFormatter(formatter);
rootLogger.addHandler(fileHandler);

Consumer<String> logSystem = (key) -> {
String value = System.getProperty(key);
rootLogger.info(key + ": " + value);
};

rootLogger.info("--- System Information ---");
logSystem.accept("java.version");
logSystem.accept("java.vendor");
logSystem.accept("java.home");
logSystem.accept("os.name");
logSystem.accept("os.arch");
logSystem.accept("os.version");
rootLogger.info("--- End System Information ---");

// OpenJDK default
System.setProperty("java.util.logging.SimpleFormatter.format", "%1$tc %2$s%n%4$s: %5$s%6$s%n");
SimpleFormatter formatter2 = new SimpleFormatter();
fileHandler.setFormatter(formatter2);
} catch (Throwable e) {
e.printStackTrace();
}
}

public static void play(Path bmsPath, BMSPlayerMode playerMode, boolean forceExit, Config config, PlayerConfig player, boolean songUpdated) {
//configuratorStage.setIconified(true);
if(config == null) {
try {
Expand Down