Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Catch another Hikari/classloading issue

Browse Source
This commit is contained in:
Luck 2021-01-18 13:18:05 +00:00
parent d5cefac65d
commit 6c34da6b32
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/hikari/HikariConnectionFactory.java
View File

@ -114,9 +114,7 @@ public abstract class HikariConnectionFactory implements ConnectionFactory {
try { try {
config = new HikariConfig(); config = new HikariConfig();
} catch (LinkageError e) { } catch (LinkageError e) {
// dumb plugins seem to keep doing stupid stuff with shading of SLF4J and Log4J. handleClassloadingError(e, plugin);
// detect this and print a more useful error message.
handleLinkageError(e, plugin);
throw e; throw e;
} }
@ -129,7 +127,11 @@ public abstract class HikariConnectionFactory implements ConnectionFactory {
String port = addressSplit.length > 1 ? addressSplit[1] : defaultPort(); String port = addressSplit.length > 1 ? addressSplit[1] : defaultPort();
// allow the implementation to configure the HikariConfig appropriately with these values // allow the implementation to configure the HikariConfig appropriately with these values
configureDatabase(config, address, port, this.configuration.getDatabase(), this.configuration.getUsername(), this.configuration.getPassword()); try {
configureDatabase(config, address, port, this.configuration.getDatabase(), this.configuration.getUsername(), this.configuration.getPassword());
} catch (NoSuchMethodError e) {
handleClassloadingError(e, plugin);
}
// get the extra connection properties from the config // get the extra connection properties from the config
Map<String, String> properties = new HashMap<>(this.configuration.getProperties()); Map<String, String> properties = new HashMap<>(this.configuration.getProperties());
@ -205,18 +207,21 @@ public abstract class HikariConnectionFactory implements ConnectionFactory {
return meta; return meta;
} }
private static void handleLinkageError(LinkageError linkageError, LuckPermsPlugin plugin) { // dumb plugins seem to keep doing stupid stuff with shading of SLF4J and Log4J.
// detect this and print a more useful error message.
private static void handleClassloadingError(Throwable throwable, LuckPermsPlugin plugin) {
List<String> noteworthyClasses = ImmutableList.of( List<String> noteworthyClasses = ImmutableList.of(
"org.slf4j.LoggerFactory", "org.slf4j.LoggerFactory",
"org.slf4j.ILoggerFactory", "org.slf4j.ILoggerFactory",
"org.apache.logging.slf4j.Log4jLoggerFactory", "org.apache.logging.slf4j.Log4jLoggerFactory",
"org.apache.logging.log4j.spi.LoggerContext", "org.apache.logging.log4j.spi.LoggerContext",
"org.apache.logging.log4j.spi.AbstractLoggerAdapter", "org.apache.logging.log4j.spi.AbstractLoggerAdapter",
"org.slf4j.impl.StaticLoggerBinder" "org.slf4j.impl.StaticLoggerBinder",
"org.slf4j.helpers.MessageFormatter"
); );
PluginLogger logger = plugin.getLogger(); PluginLogger logger = plugin.getLogger();
logger.warn("A " + linkageError.getClass().getSimpleName() + " has occurred whilst initialising Hikari. This is likely due to classloading conflicts between other plugins."); logger.warn("A " + throwable.getClass().getSimpleName() + " has occurred whilst initialising Hikari. This is likely due to classloading conflicts between other plugins.");
logger.warn("Please check for other plugins below (and try loading LuckPerms without them installed) before reporting the issue."); logger.warn("Please check for other plugins below (and try loading LuckPerms without them installed) before reporting the issue.");
for (String className : noteworthyClasses) { for (String className : noteworthyClasses) {