Fixed Shadowjar Twitch Issue

beanbeanjuice · Jul 22, 2024 · dd99d65 · dd99d65
1 parent 119c3ab
commit dd99d65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -88,8 +88,7 @@ dependencies {
 
     implementation("org.apache.logging.log4j", "log4j-api", "2.23.1")
     implementation("org.apache.logging.log4j", "log4j-core", "2.23.1")
-    implementation("org.slf4j", "slf4j-reload4j", "2.0.13")
-    implementation("org.apache.logging.log4j", "log4j-slf4j18-impl", "2.18.0")  // JDA logs.
+    implementation("org.apache.logging.log4j", "log4j-slf4j2-impl", "2.23.1")  // JDA logging.
 
     implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")
 
@@ -105,13 +104,9 @@ dependencies {
 tasks.withType<ShadowJar> {
     minimize {
         exclude(dependency("io.github.xanthic.cache:.*:.*"))
+        exclude(dependency("org.apache.logging.log4j:.*:.*"))
+        exclude(dependency("com.github.twitch4j:.*:.*"))
     }
-
-    relocate("net.dv8tion", "com.beanbeanjuice.cafebot.libs.net.dv8tion")
-    relocate("org.slf4j", "com.beanbeanjuice.cafebot.libs.org.slf4j")
-    relocate("org.apache.logging.log4j", "com.beanbeanjuice.cafebot.libs.org.apache.logging.log4j")
-    relocate("com.github.twitch4j", "com.beanbeanjuice.cafebot.libs.com.github.twitch4j")
-    relocate("com.fasterxml.jackson.core", "com.beanbeanjuice.cafebot.libs.com.fasterxml.jackson.core")
 }
 
 configure<ProcessResources>("processResources") {

diff --git a/src/main/java/com/beanbeanjuice/cafebot/utility/logging/LogManager.java b/src/main/java/com/beanbeanjuice/cafebot/utility/logging/LogManager.java
@@ -19,12 +19,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-/**
- * A class used for logging.
- *
- * @author beanbeanjuice
- * @since v3.0.1
- */
 public class LogManager {
 
     private final Time time;
@@ -323,6 +317,7 @@ public void log(@NotNull Class<?> c, @NotNull LogLevel logLevel, @NotNull String
             checkFiles();
 
         Logger logger = org.apache.logging.log4j.LogManager.getLogger(c);
+//        Logger logger = LoggerFactory.getLogger(c);
 
         switch (logLevel) {
             case INFO, LOADING, OKAY -> logger.info(message);

diff --git a/src/main/java/com/beanbeanjuice/cafebot/utility/sections/twitch/TwitchHandler.java b/src/main/java/com/beanbeanjuice/cafebot/utility/sections/twitch/TwitchHandler.java
@@ -33,6 +33,9 @@ public void handleStartup(final CafeBot cafeBot) {
                 this.addStream(channel);
                 cafeBot.getLogger().log(TwitchHandler.class, LogLevel.DEBUG, String.format("Adding Twitch Channel: %s", channel), false, false);
             });
+        }).exceptionallyAsync((e) -> {
+            cafeBot.getLogger().log(TwitchHandler.class, LogLevel.ERROR, String.format("Error Adding Twitch Channels: %s", e.getMessage()), e);
+            return null;
         });
     }