mirror of
https://github.com/Multiverse/Multiverse-Core.git
synced 2024-11-22 10:36:06 +01:00
refactor!: Remove deprecated debug log
This commit is contained in:
parent
3377c1dbe5
commit
fe8118854e
@ -5,14 +5,12 @@ import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import com.onarandombox.MultiverseCore.MultiverseCore;
|
||||
import com.onarandombox.MultiverseCore.utils.DebugLog;
|
||||
import com.pneumaticraft.commandhandler.CommandHandler;
|
||||
|
||||
/**
|
||||
@ -20,11 +18,6 @@ import com.pneumaticraft.commandhandler.CommandHandler;
|
||||
*/
|
||||
public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
|
||||
private MultiverseCore core;
|
||||
/**
|
||||
* Prefix for standard log entrys.
|
||||
*/
|
||||
protected String logTag;
|
||||
private DebugLog debugLog;
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
@ -58,8 +51,6 @@ public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
|
||||
debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
|
||||
|
||||
this.onPluginEnable();
|
||||
}
|
||||
|
@ -1,129 +0,0 @@
|
||||
/******************************************************************************
|
||||
* Multiverse 2 Copyright (c) the Multiverse Team 2011. *
|
||||
* Multiverse 2 is licensed under the BSD License. *
|
||||
* For more information please check the README.md file included *
|
||||
* with this project. *
|
||||
******************************************************************************/
|
||||
|
||||
package com.onarandombox.MultiverseCore.utils;
|
||||
|
||||
import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.logging.FileHandler;
|
||||
import java.util.logging.Formatter;
|
||||
import java.util.logging.Handler;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.LogRecord;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* The Multiverse debug-logger.
|
||||
* @deprecated Deprecated in favor of new Logging lib. See {@link com.dumptruckman.minecraft.util.Logging}.
|
||||
*/
|
||||
@Deprecated
|
||||
public class DebugLog extends Logger {
|
||||
private FileHandler fh;
|
||||
private Logger standardLog = null;
|
||||
private String prefix = "[MVCore-Debug] ";
|
||||
|
||||
/**
|
||||
* Creates a new debug logger.
|
||||
*
|
||||
* @param logger The name of the logger.
|
||||
* @param file The file to log to.
|
||||
*/
|
||||
public DebugLog(String logger, String file) {
|
||||
super(logger, null);
|
||||
try {
|
||||
this.fh = new FileHandler(file, true);
|
||||
this.setUseParentHandlers(false);
|
||||
List<Handler> toRemove = Arrays.asList(this.getHandlers());
|
||||
for (Handler handler : toRemove) {
|
||||
this.removeHandler(handler);
|
||||
}
|
||||
this.addHandler(this.fh);
|
||||
this.setLevel(Level.ALL);
|
||||
this.fh.setFormatter(new LogFormatter());
|
||||
} catch (SecurityException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the log-tag.
|
||||
* @param tag The new tag.
|
||||
*/
|
||||
public void setTag(String tag) {
|
||||
this.prefix = tag + " ";
|
||||
}
|
||||
|
||||
/**
|
||||
* Specifies the logger to use to send debug messages to as the debug logger itself only sends messages to a file.
|
||||
*
|
||||
* @param logger Logger to send debug messages to.
|
||||
*/
|
||||
public void setStandardLogger(Logger logger) {
|
||||
this.standardLog = logger;
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a message at a certain level.
|
||||
*
|
||||
* @param level The log-{@link Level}.
|
||||
* @param msg the message.
|
||||
*/
|
||||
@Override
|
||||
public void log(final Level level, final String msg) {
|
||||
if (MultiverseCoreConfiguration.isSet() && MultiverseCoreConfiguration.getInstance().getGlobalDebug() > 0) {
|
||||
// only redirect to standardLog if it's lower than INFO so we don't log that twice!
|
||||
if ((level.intValue() < Level.INFO.intValue()) && (standardLog != null)) {
|
||||
standardLog.log(Level.INFO, prefix + msg);
|
||||
}
|
||||
|
||||
super.log(level, prefix + msg);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Our log-{@link Formatter}.
|
||||
*/
|
||||
private class LogFormatter extends Formatter {
|
||||
private final SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
@Override
|
||||
public String format(LogRecord record) {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
Throwable ex = record.getThrown();
|
||||
|
||||
builder.append(this.date.format(record.getMillis()));
|
||||
builder.append(" [");
|
||||
builder.append(record.getLevel().getLocalizedName().toUpperCase());
|
||||
builder.append("] ");
|
||||
builder.append(record.getMessage());
|
||||
builder.append('\n');
|
||||
|
||||
if (ex != null) {
|
||||
StringWriter writer = new StringWriter();
|
||||
ex.printStackTrace(new PrintWriter(writer));
|
||||
builder.append(writer);
|
||||
}
|
||||
|
||||
return builder.toString();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Closes this {@link DebugLog}.
|
||||
*/
|
||||
public void close() {
|
||||
this.fh.close();
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user