Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove logger history

This commit is contained in:
ME1312 2019-01-02 13:46:10 -05:00
parent 069ecc1948
commit c05f5131b5
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
7 changed files with 3 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
# ![https://s3.postimg.cc/dikyxlz5v/Sub_Banner.png](https://s3.postimg.cc/dikyxlz5v/Sub_Banner.png)
[![Build Status](https://src.me1312.net/jenkins/job/SubServers%20Platform/badge/icon)](https://src.me1312.net/jenkins/job/SubServers%20Platform/)
[![Release Verison](https://img.shields.io/github/release/ME1312/SubServers-2/all.svg)](https://github.com/ME1312/SubServers-2/releases) [![Snapshot Verison](https://img.shields.io/badge/dynamic/xml.svg?label=snapshot&url=https%3A%2F%2Fsrc.me1312.net%2Fmaven%2Fnet%2FME1312%2FSubServers%2FSubServers.Bungee%2Fmaven-metadata.xml&query=%2F%2Fversioning%2Frelease&colorB=blue)](https://src.me1312.net/jenkins/job/SubServers%20Platform/)<br><br>
[![Release Verison](https://img.shields.io/github/release/ME1312/SubServers-2/all.svg)](https://github.com/ME1312/SubServers-2/releases) [![Snapshot Verison](https://img.shields.io/badge/dynamic/xml.svg?label=snapshot&url=https%3A%2F%2Fsrc.me1312.net%2Fmaven%2Fnet%2FME1312%2FSubServers%2FSubServers.Bungee%2Fmaven-metadata.xml&query=%2F%2Fversioning%2Frelease&colorB=blue)](https://src.me1312.net/jenkins/job/SubServers%20Platform/) [![Discord](https://img.shields.io/discord/526520424880930867.svg)](https://discord.gg/VZ8YJqz)<br><br>
SubServers 2 is a rewrite of SubServers, the Server Management Platform.<br>
> [https://www.spigotmc.org/resources/subservers-bungee.11264/](https://www.spigotmc.org/resources/subservers-bungee.11264/)<br>
> [https://www.spigotmc.org/resources/subservers-host.38833/](https://www.spigotmc.org/resources/subservers-host.38833/)<br>

10
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java vendored
View File

@ -30,7 +30,6 @@ public class ExternalSubLogger extends SubLogger {
protected String name;
protected Container<Boolean> log;
private List<SubLogFilter> filters = new ArrayList<SubLogFilter>();
private List<LogMessage> messages = new LinkedList<LogMessage>();
protected File file;
private PrintWriter writer = null;
private boolean started = false;
@ -130,9 +129,6 @@ public class ExternalSubLogger extends SubLogger {
// Log to CONSOLE
if (allow) ProxyServer.getInstance().getLogger().log(level, name + " > " + msg);
// Log to MEMORY
messages.add(new LogMessage(level, msg));
// Log to FILE
if (writer != null) {
writer.println(line);
@ -166,7 +162,6 @@ public class ExternalSubLogger extends SubLogger {
} catch (Throwable e) {
new InvocationTargetException(e, "Exception while running SubLogger Event").printStackTrace();
}
messages.clear();
if (writer != null) {
PrintWriter writer = this.writer;
this.writer = null;
@ -193,9 +188,4 @@ public class ExternalSubLogger extends SubLogger {
public boolean isLogging() {
return log.get();
}
@Override
public List<LogMessage> getMessageHistory() {
return new LinkedList<LogMessage>(messages);
}
}

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
View File

@ -109,7 +109,7 @@ public class InternalSubCreator extends SubCreator {
}
if (template.getBuildOptions().contains("Shell-Location")) {
String gitBash = InternalSubCreator.this.gitBash + ((InternalSubCreator.this.gitBash.endsWith(File.separator)) ? "" : File.separator) + "bin" + File.separatorChar + "bash.exe";
String gitBash = InternalSubCreator.this.gitBash + ((InternalSubCreator.this.gitBash.endsWith(File.separator)) ? "" : File.separator) + "bin" + File.separatorChar + "sh.exe";
File cache;
if (template.getBuildOptions().getBoolean("Use-Cache", true)) {
cache = new UniversalFile(host.plugin.dir, "SubServers:Cache:Templates:" + template.getName());

10
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
View File

@ -26,7 +26,6 @@ public class InternalSubLogger extends SubLogger {
protected String name;
protected Container<Boolean> log;
private List<SubLogFilter> filters = new ArrayList<SubLogFilter>();
private List<LogMessage> messages = new LinkedList<LogMessage>();
protected File file;
private PrintWriter writer = null;
private boolean started = false;
@ -121,9 +120,6 @@ public class InternalSubLogger extends SubLogger {
// Log to CONSOLE
if (allow) ProxyServer.getInstance().getLogger().log(level, name + " > " + msg);
// Log to MEMORY
messages.add(new LogMessage(level, msg));
// Log to FILE
if (writer != null) {
writer.println(line);
@ -171,7 +167,6 @@ public class InternalSubLogger extends SubLogger {
} catch (Throwable e) {
new InvocationTargetException(e, "Exception while running SubLogger Event").printStackTrace();
}
messages.clear();
if (writer != null) {
PrintWriter writer = this.writer;
this.writer = null;
@ -198,9 +193,4 @@ public class InternalSubLogger extends SubLogger {
public boolean isLogging() {
return log.get();
}
@Override
public List<LogMessage> getMessageHistory() {
return new LinkedList<LogMessage>(messages);
}
}

82
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubLogger.java
View File

@ -11,81 +11,6 @@ import java.util.logging.Level;
* SubLogger Layout Class
*/
public abstract class SubLogger {
/**
* Log Message Storage Class
*/
public static class LogMessage {
private Date date;
private Level level;
private String message;
/**
* Store a Message
*
* @param message Message
*/
public LogMessage(String message) {
if (Util.isNull(message)) throw new NullPointerException();
this.date = Calendar.getInstance().getTime();
this.level = Level.INFO;
this.message = message;
}
/**
* Store a Message
*
* @param level Log Level
* @param message Message
*/
public LogMessage(Level level, String message) {
if (Util.isNull(level, message)) throw new NullPointerException();
this.date = Calendar.getInstance().getTime();
this.level = level;
this.message = message;
}
/**
* Store a Message
*
* @param date Date
* @param level Log Level
* @param message Message
*/
public LogMessage(Date date, Level level, String message) {
if (Util.isNull(date, level, message)) throw new NullPointerException();
this.date = date;
this.level = level;
this.message = message;
}
/**
* Get the date this message was logged
*
* @return Date
*/
public Date getDate() {
return date;
}
/**
* Get the level this message was logged on
*
* @return Log Level
*/
public Level getLevel() {
return level;
}
/**
* Get the message
*
* @return Message
*/
public String getMessage() {
return message;
}
}
/**
* Gets the Name of the task logging
@ -118,13 +43,6 @@ public abstract class SubLogger {
*/
public abstract boolean isLogging();
/**
* Gets a list of all the messages logged by this logger
*
* @return Log Messages (named by log level)
*/
public abstract List<LogMessage> getMessageHistory();
/**
* Register Filter
*

29
SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java
View File

@ -135,7 +135,6 @@ public final class ConsoleWindow implements SubLogFilter {
@Override
public void actionPerformed(ActionEvent event) {
log.setText(RESET_VALUE);
ConsoleWindow.this.loadContent();
}
});
menu.add(item);
@ -249,7 +248,6 @@ public final class ConsoleWindow implements SubLogFilter {
public void actionPerformed(ActionEvent event) {
ansi = ((AbstractButton) event.getSource()).getModel().isSelected();
log.setText(RESET_VALUE);
ConsoleWindow.this.loadContent();
}
});
menu.add(item);
@ -517,7 +515,6 @@ public final class ConsoleWindow implements SubLogFilter {
logger.registerFilter(this);
log.setText(RESET_VALUE);
loadContent();
KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(keys);
if (logger.isLogging() && !open) open();
}
@ -528,32 +525,6 @@ public final class ConsoleWindow implements SubLogFilter {
hScroll.setVisible(input.isVisible() && hScroll.getVisibleAmount() < hScroll.getMaximum());
}
private void loadContent() {
LinkedList<Object> list = new LinkedList<Object>();
list.addAll(logger.getMessageHistory());
if (logger.getHandler() instanceof SubServer) list.addAll(((SubServer) logger.getHandler()).getCommandHistory());
Collections.sort(list, new Comparator<Object>() {
@Override
public int compare(Object A, Object B) {
Date a = null, b = null;
if (A instanceof SubLogger.LogMessage) a = ((SubLogger.LogMessage) A).getDate();
if (A instanceof SubServer.LoggedCommand) a = ((SubServer.LoggedCommand) A).getDate();
if (B instanceof SubLogger.LogMessage) b = ((SubLogger.LogMessage) B).getDate();
if (B instanceof SubServer.LoggedCommand) b = ((SubServer.LoggedCommand) B).getDate();
return (a == null || b == null) ? 0 : a.compareTo(b);
}
});
for (Object obj : list) {
if (obj instanceof SubLogger.LogMessage) log(((SubLogger.LogMessage) obj).getDate(), ((SubLogger.LogMessage) obj).getLevel(), ((SubLogger.LogMessage) obj).getMessage());
if (obj instanceof SubServer.LoggedCommand) log(((SubServer.LoggedCommand) obj).getDate(), '<' + ((((SubServer.LoggedCommand) obj).getSender() == null)?"CONSOLE":((ProxyServer.getInstance().getPlayer(((SubServer.LoggedCommand) obj).getSender()) == null)?((SubServer.LoggedCommand) obj).getSender().toString():ProxyServer.getInstance().getPlayer(((SubServer.LoggedCommand) obj).getSender()).getName())) + "> /" + ((SubServer.LoggedCommand) obj).getCommand());
}
hScroll();
}
public SubLogger getLogger() {
return logger;
}

2
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
View File

@ -259,7 +259,7 @@ public class SubCreator {
}
if (template.getBuildOptions().contains("Shell-Location")) {
String gitBash = host.host.getRawString("Git-Bash") + ((host.host.getRawString("Git-Bash").endsWith(File.separator)) ? "" : File.separator) + "bin" + File.separatorChar + "bash.exe";
String gitBash = host.host.getRawString("Git-Bash") + ((host.host.getRawString("Git-Bash").endsWith(File.separator)) ? "" : File.separator) + "bin" + File.separatorChar + "sh.exe";
File cache;
if (template.getBuildOptions().getBoolean("Use-Cache", true)) {
cache = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache:Templates:" + template.getName());