Use class loggers without the fqn for non-debug logging (#9012)
This commit is contained in:
Jake Potrebic
GitHub
parent
ff603cb76d
commit
c7520ec49d
2 changed files with 37 additions and 37 deletions
|
|
@ -456,7 +456,7 @@ index 0000000000000000000000000000000000000000..7159c72408f556d676eded668057a4c5
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..f7e43c693140b7a820b2432db312df8f7b099d4d
|
||||
index 0000000000000000000000000000000000000000..89bf48fd581ee6580b91e2eb31dd532cb622df5e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
|
||||
@@ -0,0 +1,132 @@
|
||||
|
|
@ -483,7 +483,7 @@ index 0000000000000000000000000000000000000000..f7e43c693140b7a820b2432db312df8f
|
|||
+
|
||||
+public class PluginInitializerManager {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+ private static PluginInitializerManager impl;
|
||||
+ private final Path pluginDirectory;
|
||||
+ private final Path updateDirectory;
|
||||
|
|
@ -2951,7 +2951,7 @@ index 0000000000000000000000000000000000000000..ea37ace14849ef4589a4f97287e6dcd6
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/manager/MultiRuntimePluginProviderStorage.java b/src/main/java/io/papermc/paper/plugin/manager/MultiRuntimePluginProviderStorage.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..365aa894c77b095bfe23bdaab354591df32bcda2
|
||||
index 0000000000000000000000000000000000000000..48696ee62cfaef27ea512464d33ac502f5ec3ccd
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/manager/MultiRuntimePluginProviderStorage.java
|
||||
@@ -0,0 +1,49 @@
|
||||
|
|
@ -2971,7 +2971,7 @@ index 0000000000000000000000000000000000000000..365aa894c77b095bfe23bdaab354591d
|
|||
+
|
||||
+public class MultiRuntimePluginProviderStorage extends ServerPluginProviderStorage {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+ private final List<JavaPlugin> provided = new ArrayList<>();
|
||||
+
|
||||
+ @Override
|
||||
|
|
@ -4969,7 +4969,7 @@ index 0000000000000000000000000000000000000000..a180612a1ec395202dbae1ca5b97ec01
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..ed00c412f1703b38674bbd0d483fcb100aa99f9d
|
||||
index 0000000000000000000000000000000000000000..1572c3942c850eb36df38cf06395bcafa24e18e0
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/provider/source/DirectoryProviderSource.java
|
||||
@@ -0,0 +1,40 @@
|
||||
|
|
@ -4989,7 +4989,7 @@ index 0000000000000000000000000000000000000000..ed00c412f1703b38674bbd0d483fcb10
|
|||
+public class DirectoryProviderSource extends FileProviderSource {
|
||||
+
|
||||
+ public static final DirectoryProviderSource INSTANCE = new DirectoryProviderSource();
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ public DirectoryProviderSource() {
|
||||
+ super("File '%s'"::formatted);
|
||||
|
|
@ -5178,7 +5178,7 @@ index 0000000000000000000000000000000000000000..3b1215fcfa1b9de42d8f946c4e2b4572
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/PluginFlagProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/PluginFlagProviderSource.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..e62b476ddbce2bdc66061c116aa0228622f6fd16
|
||||
index 0000000000000000000000000000000000000000..205aec4017df65ab268835a8db1687438fba4e1a
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/provider/source/PluginFlagProviderSource.java
|
||||
@@ -0,0 +1,29 @@
|
||||
|
|
@ -5197,7 +5197,7 @@ index 0000000000000000000000000000000000000000..e62b476ddbce2bdc66061c116aa02286
|
|||
+public class PluginFlagProviderSource implements ProviderSource<List<File>> {
|
||||
+
|
||||
+ public static final PluginFlagProviderSource INSTANCE = new PluginFlagProviderSource();
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+ private final FileProviderSource providerSource = new FileProviderSource("File '%s' specified through 'add-plugin' argument"::formatted);
|
||||
+
|
||||
+ @Override
|
||||
|
|
@ -6096,7 +6096,7 @@ index 0000000000000000000000000000000000000000..14ed05945ba5bfeb2b539d4786278b0e
|
|||
+
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/storage/BootstrapProviderStorage.java b/src/main/java/io/papermc/paper/plugin/storage/BootstrapProviderStorage.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..e5b70ff297febd936e64055b79f48712d65dbed9
|
||||
index 0000000000000000000000000000000000000000..2851c22ed74792bf7b60139c46776407e5163463
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/storage/BootstrapProviderStorage.java
|
||||
@@ -0,0 +1,57 @@
|
||||
|
|
@ -6124,7 +6124,7 @@ index 0000000000000000000000000000000000000000..e5b70ff297febd936e64055b79f48712
|
|||
+
|
||||
+public class BootstrapProviderStorage extends SimpleProviderStorage<PluginBootstrap> {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ public BootstrapProviderStorage() {
|
||||
+ super(new ModernPluginLoadingStrategy<>(new ProviderConfiguration<>() {
|
||||
|
|
@ -6206,7 +6206,7 @@ index 0000000000000000000000000000000000000000..374e7d3d69fc8603ecf54999f173123d
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/storage/ServerPluginProviderStorage.java b/src/main/java/io/papermc/paper/plugin/storage/ServerPluginProviderStorage.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..fbe76a678f45bd3c55f25f2b6a4366efc0521cb8
|
||||
index 0000000000000000000000000000000000000000..cb9b13522a976b82bcb71cef486f11f4172e3e99
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/storage/ServerPluginProviderStorage.java
|
||||
@@ -0,0 +1,70 @@
|
||||
|
|
@ -6229,7 +6229,7 @@ index 0000000000000000000000000000000000000000..fbe76a678f45bd3c55f25f2b6a4366ef
|
|||
+
|
||||
+public class ServerPluginProviderStorage extends ConfiguredProviderStorage<JavaPlugin> {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ public ServerPluginProviderStorage() {
|
||||
+ super(new ProviderConfiguration<>() {
|
||||
|
|
@ -6282,7 +6282,7 @@ index 0000000000000000000000000000000000000000..fbe76a678f45bd3c55f25f2b6a4366ef
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/storage/SimpleProviderStorage.java b/src/main/java/io/papermc/paper/plugin/storage/SimpleProviderStorage.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..a7085dbf2c5ace9b6887d024c0785fa529e0f1da
|
||||
index 0000000000000000000000000000000000000000..9abfc8778614f7bc4da32a27c7f4964caff05c63
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/storage/SimpleProviderStorage.java
|
||||
@@ -0,0 +1,85 @@
|
||||
|
|
@ -6300,7 +6300,7 @@ index 0000000000000000000000000000000000000000..a7085dbf2c5ace9b6887d024c0785fa5
|
|||
+
|
||||
+public abstract class SimpleProviderStorage<T> implements ProviderStorage<T> {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ protected final List<PluginProvider<T>> providers = new ArrayList<>();
|
||||
+ protected ProviderLoadingStrategy<T> strategy;
|
||||
|
|
@ -6384,7 +6384,7 @@ index 0000000000000000000000000000000000000000..c1114675137e862ac9682b635bfdbfbc
|
|||
+package io.papermc.paper.plugin.storage;
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/util/EntrypointUtil.java b/src/main/java/io/papermc/paper/plugin/util/EntrypointUtil.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..98518351e616e536315cd89790b327d3bad33d0e
|
||||
index 0000000000000000000000000000000000000000..6507e0103c6afde2bed31e25b70e7402fa3af823
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/util/EntrypointUtil.java
|
||||
@@ -0,0 +1,19 @@
|
||||
|
|
@ -6397,7 +6397,7 @@ index 0000000000000000000000000000000000000000..98518351e616e536315cd89790b327d3
|
|||
+
|
||||
+public class EntrypointUtil {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ public static <C> void registerProvidersFromSource(ProviderSource<C> source, C context) {
|
||||
+ try {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue