summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEdGruberman <ed@rjump.com>2012-08-11 16:29:50 -0700
committerfeildmaster <admin@feildmaster.com>2012-08-21 19:17:29 -0500
commit450edc300442a98a82389ed02d9b605d93fa5ecf (patch)
treeab6ac4ca0697862cac9ac2e1682d907c47c62150 /src
parent161ab5edc67e0cb73a7f2a496b0b957da04e8fbb (diff)
downloadcraftbukkit-450edc300442a98a82389ed02d9b605d93fa5ecf.tar
craftbukkit-450edc300442a98a82389ed02d9b605d93fa5ecf.tar.gz
craftbukkit-450edc300442a98a82389ed02d9b605d93fa5ecf.tar.lz
craftbukkit-450edc300442a98a82389ed02d9b605d93fa5ecf.tar.xz
craftbukkit-450edc300442a98a82389ed02d9b605d93fa5ecf.zip
Use standard format function to format logs. Addresses BUKKIT-2246
Also fix "excess" Log Levels.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/ConsoleLogFormatter.java4
-rw-r--r--src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/ConsoleLogFormatter.java b/src/main/java/net/minecraft/server/ConsoleLogFormatter.java
index 943bb952..6a58493c 100644
--- a/src/main/java/net/minecraft/server/ConsoleLogFormatter.java
+++ b/src/main/java/net/minecraft/server/ConsoleLogFormatter.java
@@ -39,11 +39,11 @@ final class ConsoleLogFormatter extends Formatter {
stringbuilder.append(" [WARNING] ");
} else if (level == Level.SEVERE) {
stringbuilder.append(" [SEVERE] ");
- } else if (level == Level.SEVERE) {
+ } else { // CraftBukkit
stringbuilder.append(" [").append(level.getLocalizedName()).append("] ");
}
- stringbuilder.append(logrecord.getMessage());
+ stringbuilder.append(formatMessage(logrecord)); // CraftBukkit
stringbuilder.append('\n');
Throwable throwable = logrecord.getThrown();
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java b/src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java
index 42885fde..2dbfef96 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java
@@ -46,7 +46,7 @@ public class ShortConsoleLogFormatter extends Formatter {
builder.append(" [");
builder.append(record.getLevel().getLocalizedName().toUpperCase());
builder.append("] ");
- builder.append(record.getMessage());
+ builder.append(formatMessage(record));
builder.append('\n');
if (ex != null) {