diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-20 01:53:06 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-20 01:53:06 +0000 |
commit | 264b5c331d98f992a340fa0c193ce44b8a948c77 (patch) | |
tree | fc70cca36d1ade27bd6fffe0886fd63318192756 /src | |
parent | a6b3965672d4d25007571b63b718ef791f128894 (diff) | |
download | craftbukkit-264b5c331d98f992a340fa0c193ce44b8a948c77.tar craftbukkit-264b5c331d98f992a340fa0c193ce44b8a948c77.tar.gz craftbukkit-264b5c331d98f992a340fa0c193ce44b8a948c77.tar.lz craftbukkit-264b5c331d98f992a340fa0c193ce44b8a948c77.tar.xz craftbukkit-264b5c331d98f992a340fa0c193ce44b8a948c77.zip |
Redirect System.out and System.err to a Logger
Diffstat (limited to 'src')
3 files changed, 44 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 7cbbbefc..6f16c45c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,6 +3,7 @@ package net.minecraft.server; import java.awt.GraphicsEnvironment; import java.io.File; import java.io.IOException; +import java.io.PrintStream; import java.net.InetAddress; import java.util.ArrayList; import java.util.Collections; @@ -17,6 +18,7 @@ import java.net.UnknownHostException; import joptsimple.OptionSet; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.LoggerOutputStream; import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.event.Event; import org.bukkit.event.world.WorldEvent; @@ -61,6 +63,12 @@ public class MinecraftServer implements ICommandListener, Runnable { threadcommandreader.setDaemon(true); threadcommandreader.start(); ConsoleLogManager.a(); + + // Craftbukkit start + System.setOut(new PrintStream(new LoggerOutputStream(a, Level.INFO), true)); + System.setErr(new PrintStream(new LoggerOutputStream(a, Level.SEVERE), true)); + // Craftbukkit end + a.info("Starting minecraft server version Beta 1.2_01"); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { a.warning("**** NOT ENOUGH RAM!"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 9d30b79c..6365b382 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -260,4 +260,8 @@ public final class CraftServer implements Server { pluginManager.callEvent(new WorldEvent(Type.WORLD_LOADED, world)); } + + public Logger getLogger() { + return MinecraftServer.a; + } } diff --git a/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java b/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java new file mode 100644 index 00000000..d2637ad8 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java @@ -0,0 +1,32 @@ + +package org.bukkit.craftbukkit; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class LoggerOutputStream extends ByteArrayOutputStream { + private final String separator = System.getProperty("line.separator"); + private final Logger logger; + private final Level level; + + public LoggerOutputStream(Logger logger, Level level) { + super(); + this.logger = logger; + this.level = level; + } + + @Override + public void flush() throws IOException { + synchronized (this) { + super.flush(); + String record = this.toString(); + super.reset(); + + if ((record.length() > 0) && (!record.equals(separator))) { + logger.logp(level, "", "", record); + } + } + } +} |