geforkt von Mirrors/Paper
Added command line option 'date-format' to control how dates are printed to console (not to log)
By: Dinnerbone <dinnerbone@dinnerbone.com>
Dieser Commit ist enthalten in:
Ursprung
4908869924
Commit
6940b583c4
@ -2,6 +2,9 @@ package org.bukkit.craftbukkit;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.text.DateFormat;
|
||||||
|
import java.text.Format;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
@ -53,6 +56,11 @@ public class Main {
|
|||||||
.withRequiredArg()
|
.withRequiredArg()
|
||||||
.ofType(Integer.class)
|
.ofType(Integer.class)
|
||||||
.describedAs("Server size");
|
.describedAs("Server size");
|
||||||
|
|
||||||
|
acceptsAll(asList("d", "date-format"), "Format of the date to display in the console (for log entries)")
|
||||||
|
.withRequiredArg()
|
||||||
|
.ofType(SimpleDateFormat.class)
|
||||||
|
.describedAs("Log date format");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -5,9 +5,35 @@ import java.io.StringWriter;
|
|||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.logging.Formatter;
|
import java.util.logging.Formatter;
|
||||||
import java.util.logging.LogRecord;
|
import java.util.logging.LogRecord;
|
||||||
|
import joptsimple.OptionException;
|
||||||
|
import joptsimple.OptionSet;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
|
||||||
public class ShortConsoleLogFormatter extends Formatter {
|
public class ShortConsoleLogFormatter extends Formatter {
|
||||||
private final SimpleDateFormat date = new SimpleDateFormat("HH:mm:ss");
|
private final SimpleDateFormat date;
|
||||||
|
|
||||||
|
public ShortConsoleLogFormatter(MinecraftServer server) {
|
||||||
|
OptionSet options = server.options;
|
||||||
|
SimpleDateFormat date = null;
|
||||||
|
|
||||||
|
if (options.has("date-format")) {
|
||||||
|
try {
|
||||||
|
Object object = options.valueOf("date-format");
|
||||||
|
|
||||||
|
if ((object != null) && (object instanceof SimpleDateFormat)) {
|
||||||
|
date = (SimpleDateFormat)object;
|
||||||
|
}
|
||||||
|
} catch (OptionException ex) {
|
||||||
|
System.err.println("Given date format is not valid. Falling back to default.");
|
||||||
|
} finally {
|
||||||
|
if (date == null) {
|
||||||
|
date = new SimpleDateFormat("HH:mm:ss");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.date = date;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String format(LogRecord record) {
|
public String format(LogRecord record) {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren