LiteLoader 1.6.4_02 - dev only - change logger to play better with new launcher …

…(don't unnecessarily prepend date/time/level)

LiteLoader 1.6.4_02 - dev only - change logger to play better with new launcher …
…(don't unnecessarily prepend date/time/level)
Mumfrey
1 parent cc303e4e
Showing 3 changed files with 27 additions and 16 deletions
debug/com/mumfrey/liteloader/debug/Start.java
java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/com/mumfrey/liteloader/util/log/LiteLoaderLogFormatter.java
@@ -54,10 +54,12 @@ public abstract class Start
 	private static void prepareLogger()
 	{
+		System.setProperty("liteloaderFormatLog", "true");
+		
 		for (Handler handler : Start.logger.getParent().getHandlers())
 		{
 			if (handler instanceof ConsoleHandler)
-				handler.setFormatter(new LiteLoaderLogFormatter());
+				handler.setFormatter(new LiteLoaderLogFormatter(false));
 		}
 	}
 }
@@ -11,7 +11,6 @@ import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Properties;
 import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.StreamHandler;
@@ -107,7 +106,7 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	 * The mod enumerator instance
 	 */
 	private LiteLoaderEnumerator enumerator;
-
+	
 	/**
 	 * @param gameDirectory
 	 * @param assetsDirectory
@@ -231,17 +230,15 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	 */
 	private void prepareLogger() throws SecurityException, IOException
 	{
-		Formatter logFormatter = new LiteLoaderLogFormatter();
-		
 		LiteLoaderBootstrap.logger.setUseParentHandlers(false);
 		LiteLoaderBootstrap.useStdOut = System.getProperty("liteloader.log", "stderr").equalsIgnoreCase("stdout") || this.localProperties.getProperty("log", "stderr").equalsIgnoreCase("stdout");
 		StreamHandler consoleHandler = useStdOut ? new com.mumfrey.liteloader.util.log.ConsoleHandler() : new java.util.logging.ConsoleHandler();
-		consoleHandler.setFormatter(logFormatter);
+		consoleHandler.setFormatter(new LiteLoaderLogFormatter(false));
 		LiteLoaderBootstrap.logger.addHandler(consoleHandler);
 		FileHandler logFileHandler = new FileHandler(this.logFile.getAbsolutePath());
-		logFileHandler.setFormatter(logFormatter);
+		logFileHandler.setFormatter(new LiteLoaderLogFormatter(true));
 		LiteLoaderBootstrap.logger.addHandler(logFileHandler);
 	}
@@ -9,24 +9,36 @@ import java.util.logging.LogRecord;
 public class LiteLoaderLogFormatter extends Formatter
 {
-	private SimpleDateFormat simpleDateFormatLogFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	private static SimpleDateFormat simpleDateFormatLogFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+	private boolean prepend = false;
+	public LiteLoaderLogFormatter(boolean prependDateAndTime)
+	{
+		this.prepend = prependDateAndTime || System.getProperty("liteloaderFormatLog") != null;
+	}
+
 	@Override
 	public String format(LogRecord logRecord)
 	{
 		StringBuilder sb = new StringBuilder();
-		sb.append(this.simpleDateFormatLogFormatter.format(Long.valueOf(logRecord.getMillis())));
-		Level level = logRecord.getLevel();
-		
-		if (level == Level.SEVERE)
-			sb.append(" [").append(level.getLocalizedName()).append("] ");
+		if (this.prepend)
+		{
+			sb.append(this.simpleDateFormatLogFormatter.format(Long.valueOf(logRecord.getMillis())));
+			Level level = logRecord.getLevel();
+			if (level == Level.SEVERE)
+				sb.append(" [").append(level.getLocalizedName()).append("] ");
+			else
+				sb.append(" [").append(level.toString().toUpperCase()).append("] ");
+		}
 		else
-			sb.append(" [").append(level.toString().toUpperCase()).append("] ");
+		{
+			sb.append("LiteLoader> ");
+		}
 		sb.append(logRecord.getMessage());
 		sb.append('\n');
 		Throwable th = logRecord.getThrown();
-		
 		if (th != null)
 		{
 			StringWriter stringWriter = new StringWriter();
@@ -36,4 +48,4 @@ public class LiteLoaderLogFormatter extends Formatter
 		return sb.toString();
 	}
-}
+}
 \ No newline at end of file