Upstream/ColorConsole
1
0
Fork 0
mirror of https://github.com/games647/ColorConsole.git synced 2024-11-23 19:05:19 +01:00
Code Issues Projects Releases Wiki Activity

Add plugin tag highlighting

Browse Source
This commit is contained in:
games647 2016-05-04 18:21:13 +02:00
parent 4f8b3d404c
commit b3a825a6c9
3 changed files with 95 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pom.xml
View File

@ -8,7 +8,7 @@
<packaging>jar</packaging>
<name>ColorConsole</name>
<version>1.0</version>
<version>1.1</version>
<inceptionYear>2016</inceptionYear>
<url>http://dev.bukkit.org/bukkit-plugins/colorconsole/</url>
<description>
@ -94,6 +94,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>1.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>

54
src/main/java/com/github/games647/colorconsole/ColorConsole.java
View File

@ -4,11 +4,11 @@ import java.io.Serializable;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.DefaultConfiguration;
@ -32,40 +32,60 @@ public class ColorConsole extends JavaPlugin {
@Override
public void onDisable() {
Appender terminalAppender = getTerminalAppender();
Logger rootLogger = ((Logger) LogManager.getRootLogger());
ColorPluginAppender colorPluginAppender = null;
for (Appender value : rootLogger.getAppenders().values()) {
if (value instanceof ColorPluginAppender) {
colorPluginAppender = (ColorPluginAppender) value;
break;
}
}
if (colorPluginAppender != null) {
rootLogger.removeAppender(terminalAppender);
rootLogger.addAppender(colorPluginAppender.getOldAppender());
}
setLayout(oldLayout);
}
private void installLogFormat() {
LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
Configuration conf = ctx.getConfiguration();
// ConsoleAppender consoleAppender = (ConsoleAppender) conf.getAppenders().get("WINDOWS_COMPAT");
Appender terminalAppender = conf.getAppenders().get("TerminalConsole");
Appender terminalAppender = getTerminalAppender();
oldLayout = terminalAppender.getLayout();
PatternLayout layout = PatternLayout
.createLayout("[%highlight{%d{HH:mm:ss} %-5level]: %msg%n}{FATAL=red blink, ERROR=red, WARN=yellow bold, "
+ "INFO=gray, DEBUG=green bold, TRACE=blue}", new DefaultConfiguration(), null
, Charset.defaultCharset().name(), "true");
.createLayout("%highlight{[%d{HH:mm:ss} %-5level]: %msg%n}{FATAL=red blink, ERROR=red, "
+ "WARN=yellow bold, INFO=gray, DEBUG=green bold, TRACE=blue}", new DefaultConfiguration()
, null, Charset.defaultCharset().name(), "true");
setLayout(layout);
Logger rootLogger = ((Logger) LogManager.getRootLogger());
ColorPluginAppender pluginAppender = new ColorPluginAppender(terminalAppender);
pluginAppender.start();
rootLogger.removeAppender(terminalAppender);
rootLogger.addAppender(pluginAppender);
}
private void setLayout(Layout<? extends Serializable> layout) {
LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
Configuration conf = ctx.getConfiguration();
Appender terminalAppender = conf.getAppenders().get("TerminalConsole");
Appender terminalAppender = getTerminalAppender();
try {
Field field = terminalAppender.getClass().getSuperclass().getDeclaredField("layout");
field.setAccessible(true);
field.set(terminalAppender, layout);
} catch (Exception ex) {
Logger.getLogger(ColorConsole.class.getName()).log(Level.SEVERE, "Failed to install log format", ex);
getLogger().log(Level.SEVERE, "Failed to install log format", ex);
}
}
// conf.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(org.apache.logging.log4j.Level.ALL);
ctx.updateLoggers(conf);
private Appender getTerminalAppender() {
LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
Configuration conf = ctx.getConfiguration();
return conf.getAppenders().get("TerminalConsole");
}
}

49
src/main/java/com/github/games647/colorconsole/ColorPluginAppender.java Normal file
View File

@ -0,0 +1,49 @@
package com.github.games647.colorconsole;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.SimpleMessage;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.Ansi.Attribute;
public class ColorPluginAppender extends AbstractAppender {
private final Appender oldAppender;
public ColorPluginAppender(Appender oldAppender) {
super(oldAppender.getName(), null, oldAppender.getLayout());
this.oldAppender = oldAppender;
}
@Override
public void append(LogEvent event) {
if (isStarted() && oldAppender.isStarted()) {
Message newMessage = new SimpleMessage(colorizePluginTag(event.getMessage().getFormattedMessage()));
LogEvent newEvent = new Log4jLogEvent(event.getLoggerName(), event.getMarker(), event.getFQCN()
, event.getLevel(), newMessage, event.getThrown(), event.getContextMap()
, event.getContextStack(), event.getThreadName(), event.getSource(), event.getMillis());
oldAppender.append(newEvent);
}
}
public Appender getOldAppender() {
return oldAppender;
}
private String colorizePluginTag(String message) {
if (!message.contains("[") || !message.contains("]")) {
return message;
}
int start = message.indexOf('[') + 1;
int end = message.indexOf(']', start);
String prefix = Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).toString();
String resetSuffix = Ansi.ansi().a(Attribute.RESET).toString();
return '[' + prefix + message.substring(start, end) + resetSuffix + message.substring(end);
}
}