PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try a cleaner stdout/stderr -> logger redirector

Browse Source
This commit is contained in:
Marc Baloup 2023-03-17 15:41:39 +01:00
parent ff5d776aa5
commit 5b40c4aabb
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandalib-cli/src/main/java/fr/pandacube/lib/cli/log/CLILogger.java
View File

@ -1,15 +1,18 @@
package fr.pandacube.lib.cli.log; package fr.pandacube.lib.cli.log;
import java.io.PrintStream;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
import fr.pandacube.lib.cli.CLI; import fr.pandacube.lib.cli.CLI;
import fr.pandacube.lib.util.Log; import fr.pandacube.lib.util.Log;
import fr.pandacube.lib.util.ThrowableUtil;
import net.md_5.bungee.log.ColouredWriter; import net.md_5.bungee.log.ColouredWriter;
import net.md_5.bungee.log.ConciseFormatter; import net.md_5.bungee.log.ConciseFormatter;
import net.md_5.bungee.log.LoggingOutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PrintStream;
import java.util.Scanner;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* Initializer for the logging system of a CLI application. * Initializer for the logging system of a CLI application.
@ -38,12 +41,33 @@ public class CLILogger {
fileHandler.setFormatter(new ConciseFormatter(false)); fileHandler.setFormatter(new ConciseFormatter(false));
logger.addHandler(fileHandler); logger.addHandler(fileHandler);
System.setErr(new PrintStream(new LoggingOutputStream(logger, Level.SEVERE), true)); System.setErr(newRedirector(logger, Level.SEVERE));
System.setOut(new PrintStream(new LoggingOutputStream(logger, Level.INFO), true)); System.setOut(newRedirector(logger, Level.INFO));
Log.setLogger(logger); Log.setLogger(logger);
} }
return logger; return logger;
} }
private static PrintStream newRedirector(Logger logger, Level level) {
PipedOutputStream pos = new PipedOutputStream();
PrintStream ps = new PrintStream(pos);
PipedInputStream pis = new PipedInputStream();
ThrowableUtil.wrapEx(() -> pos.connect(pis));
Scanner s = new Scanner(pis);
Thread t = new Thread(() -> {
while(s.hasNextLine()) {
logger.logp(level, "", "", s.nextLine());
}
s.close();
}, "Logging Redirector Thread (" + level + ")");
t.setDaemon(true);
t.start();
return ps;
}
} }