c85ea66260
Essentials uses a custom logger name ("Essentials") instead of the
plugin logger. Log messages are redirected to the plugin logger by
setting the parent of the "Essentials" logger to the plugin logger.
With our changes, the plugin logger is now also called "Essentials",
resulting in an infinite loop. Make sure plugins can't change the
parent of the plugin logger to avoid this.
47 lines
1.7 KiB
Java
47 lines
1.7 KiB
Java
package com.destroystokyo.paper.utils;
|
|
|
|
import io.papermc.paper.plugin.configuration.PluginMeta;
|
|
import java.util.logging.Level;
|
|
import java.util.logging.LogManager;
|
|
import java.util.logging.Logger;
|
|
import org.bukkit.plugin.PluginDescriptionFile;
|
|
import org.jspecify.annotations.NullMarked;
|
|
|
|
/**
|
|
* Prevents plugins (e.g. Essentials) from changing the parent of the plugin logger.
|
|
*/
|
|
@NullMarked
|
|
public class PaperPluginLogger extends Logger {
|
|
|
|
@Deprecated(forRemoval = true)
|
|
public static Logger getLogger(final PluginDescriptionFile description) {
|
|
return getLogger((PluginMeta) description);
|
|
}
|
|
|
|
public static Logger getLogger(final PluginMeta meta) {
|
|
Logger logger = new PaperPluginLogger(meta);
|
|
if (!LogManager.getLogManager().addLogger(logger)) {
|
|
// Disable this if it's going to happen across reloads anyways...
|
|
//logger.log(Level.WARNING, "Could not insert plugin logger - one was already found: {}", LogManager.getLogManager().getLogger(this.getName()));
|
|
logger = LogManager.getLogManager().getLogger(meta.getLoggerPrefix() != null ? meta.getLoggerPrefix() : meta.getName());
|
|
}
|
|
|
|
return logger;
|
|
}
|
|
|
|
private PaperPluginLogger(final PluginMeta meta) {
|
|
super(meta.getLoggerPrefix() != null ? meta.getLoggerPrefix() : meta.getName(), null);
|
|
}
|
|
|
|
@Override
|
|
public void setParent(final Logger parent) {
|
|
if (this.getParent() != null) {
|
|
this.warning("Ignoring attempt to change parent of plugin logger");
|
|
} else {
|
|
this.log(Level.FINE, "Setting plugin logger parent to {0}", parent);
|
|
super.setParent(parent);
|
|
}
|
|
}
|
|
|
|
}
|