Add log suppression for library loader (#1160)

PurpurMC · Oct 15, 2022 · 9bd5c44 · 9bd5c44
1 parent a86e8fe
commit 9bd5c44
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 0 deletions.
diff --git a/patches/api/0055-Add-log-suppression-for-LibraryLoader.patch b/patches/api/0055-Add-log-suppression-for-LibraryLoader.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Krakenied <Krakenied1@gmail.com>
+Date: Fri, 14 Oct 2022 23:11:27 +0200
+Subject: [PATCH] Add log suppression for LibraryLoader
+
+
+diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+index a16c841751bc44e46d27fc4efbfc2ab23cc7b0d7..4dd9306c13aff0e54521e1c157b8a9c16db7387a 100644
+--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+@@ -57,6 +57,7 @@ public final class JavaPluginLoader implements PluginLoader {
+     private final Map<String, Integer> classLoadLockCount = new java.util.HashMap<String, Integer>(); // Paper
+     private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
+     private final LibraryLoader libraryLoader;
++    public static boolean SuppressLibraryLoaderLogger = false; // Purpur
+
+     /**
+      * This class was not meant to be constructed explicitly
+diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
+index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..06a7f27aa7c3963f63fe158438a83fdf67a20c51 100644
+--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
+@@ -62,6 +62,7 @@ class LibraryLoader
+             @Override
+             public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
+             {
++                if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
+                 logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
+             }
+         } );
+@@ -77,6 +78,7 @@ class LibraryLoader
+         {
+             return null;
+         }
++        if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
+         logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
+         {
+             desc.getName(), desc.getLibraries().size()
+@@ -115,6 +117,7 @@ class LibraryLoader
+             }
+
+             jarFiles.add( url );
++            if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
+             logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[]
+             {
+                 desc.getName(), file
diff --git a/patches/server/0310-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0310-Add-log-suppression-for-LibraryLoader.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Krakenied <Krakenied1@gmail.com>
+Date: Fri, 14 Oct 2022 23:11:16 +0200
+Subject: [PATCH] Add log suppression for LibraryLoader
+
+
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index 3cfbb4300e82cce409a7a0b53ef98987f166143c..5d71e3040df116a94df7efa83e61dc1766cc4a93 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -488,12 +488,15 @@ public class PurpurConfig {
+     public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
+     public static boolean loggerSuppressSetBlockFarChunk = false;
+     public static boolean loggerSuppressSentExpiredChat = false;
++    public static boolean loggerSuppressLibraryLoader = false;
+     private static void loggerSettings() {
+         loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
+         loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
+         loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
+         loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
+         loggerSuppressSentExpiredChat = getBoolean("settings.logger.suppress-sent-expired-chat", loggerSuppressSentExpiredChat);
++        loggerSuppressLibraryLoader = getBoolean("settings.logger.suppress-library-loader", loggerSuppressLibraryLoader);
++        org.bukkit.plugin.java.JavaPluginLoader.SuppressLibraryLoaderLogger = loggerSuppressLibraryLoader;
+     }
+
+     public static boolean tpsCatchup = true;