keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Make console logging pass through a single logging thread to avoid concurrency problems with launchers and stuff

Browse source
This commit is contained in:
Christian 2012-09-04 19:11:45 -04:00
parent 6d9b9fde47
commit 50c74f93bd
1 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java
View file

@ -4,15 +4,70 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.ConsoleHandler;
import java.util.logging.FileHandler;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
public class FMLRelaunchLog
{
private static class ConsoleLogWrapper extends Handler
{
@Override
public void publish(LogRecord record)
{
try
{
ConsoleLogThread.recordQueue.put(record);
}
catch (InterruptedException e)
{
Thread.interrupted();
}
}
@Override
public void flush()
{
}
@Override
public void close() throws SecurityException
{
}
}
private static class ConsoleLogThread implements Runnable
{
static ConsoleHandler wrappedHandler = new ConsoleHandler();
static LinkedBlockingQueue<LogRecord> recordQueue = new LinkedBlockingQueue<LogRecord>();
@Override
public void run()
{
do
{
LogRecord lr;
try
{
lr = recordQueue.take();
wrappedHandler.publish(lr);
}
catch (InterruptedException e)
{
Thread.interrupted();
// Stupid
}
}
while (true);
}
}
private static class LoggingOutStream extends ByteArrayOutputStream
{
private Logger log;
@ -28,7 +83,7 @@ public class FMLRelaunchLog
public void flush() throws IOException
{
String record;
synchronized(this)
synchronized(FMLRelaunchLog.class)
{
super.flush();
record = this.toString();
@ -57,6 +112,8 @@ public class FMLRelaunchLog
static File minecraftHome;
private static boolean configured;
private static Thread consoleLogThread;
private Logger myLog;
private FMLRelaunchLog()
@ -80,11 +137,12 @@ public class FMLRelaunchLog
FMLLogFormatter formatter = new FMLLogFormatter();
// Console handler captures the normal stderr before it gets replaced
ConsoleHandler ch = new ConsoleHandler();
ch.setLevel(Level.parse(System.getProperty("fml.log.level","INFO")));
log.myLog.setUseParentHandlers(false);
log.myLog.addHandler(ch);
ch.setFormatter(formatter);
log.myLog.addHandler(new ConsoleLogWrapper());
consoleLogThread = new Thread(new ConsoleLogThread());
consoleLogThread.start();
ConsoleLogThread.wrappedHandler.setLevel(Level.parse(System.getProperty("fml.log.level","INFO")));
ConsoleLogThread.wrappedHandler.setFormatter(formatter);
log.myLog.setLevel(Level.ALL);
try
{