Skip to content

Commit e41f66b

Browse files
committed
Added some more debug guards, so we dont spam console...
1 parent 985ac23 commit e41f66b

5 files changed

Lines changed: 26 additions & 18 deletions

File tree

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ dependencies {
8787
testImplementation platform('org.junit:junit-bom:5.9.1')
8888
testImplementation 'org.junit.jupiter:junit-jupiter'
8989

90-
installer('org.mangorage:installer:4.0.26')
91-
bootstrap("org.mangorage:mangobotbootstrap:1.0.84")
90+
installer('org.mangorage:installer:4.0.30')
91+
bootstrap("org.mangorage:mangobotbootstrap:1.0.101")
9292

93-
launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
93+
launchtarget("org.mangorage:mangobotlaunchtarget:0.1.23")
9494

95-
plugin('org.mangorage:mangobot:12.0.123')
96-
plugin('org.mangorage:mangobotplugin:12.0.72')
95+
plugin('org.mangorage:mangobot:12.0.147')
96+
plugin('org.mangorage:mangobotplugin:12.0.83')
9797

9898
library('org.eclipse.jetty:jetty-server:11.0.16')
9999
library('org.eclipse.jetty:jetty-servlet:11.0.16')

src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
requires net.dv8tion.jda;
1111
requires com.fasterxml.jackson.databind;
1212
requires org.mangorage.bootstrap;
13+
requires common;
1314

1415
// Files
1516
opens templates;

src/main/java/org/mangorage/mangobotsite/website/FolderPruner.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33

44

5-
import org.mangorage.mangobotcore.api.util.log.LogHelper;
5+
import org.mangorage.bootstrap.api.logging.IDeferredMangoLogger;
6+
import org.mangorage.bootstrap.api.logging.ILoggerFactory;
67

78
import java.io.File;
89
import java.util.Arrays;
910
import java.util.Comparator;
1011
import java.util.List;
1112

1213
public final class FolderPruner {
14+
private static final IDeferredMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j", FolderPruner.class);
1315
// Configurable Variables
1416
private static final String FOLDER_PATH = "webpage-root/uploads"; // Path to your folder
1517
private static final double MAX_SIZE_GB = 0.2; // Maximum size in GB
@@ -26,7 +28,7 @@ public static void init() {
2628
private static void pruneFolder() {
2729
File folder = new File(FOLDER_PATH);
2830
if (!folder.exists() || !folder.isDirectory()) {
29-
LogHelper.error("Invalid folder path.");
31+
LOGGER.get().error("Invalid folder path.");
3032
return;
3133
}
3234

@@ -36,7 +38,7 @@ private static void pruneFolder() {
3638

3739
// If the folder size exceeds the limit, prune the folder
3840
if (currentSizeBytes > maxSizeBytes) {
39-
LogHelper.info("Folder exceeds size limit. Starting pruning process...");
41+
LOGGER.get().info("Folder exceeds size limit. Starting pruning process...");
4042

4143
// Get files older than the specified age limit
4244
List<File> filesToDelete = Arrays.stream(folder.listFiles())
@@ -47,12 +49,12 @@ private static void pruneFolder() {
4749
// Delete files until the folder is within the size limit
4850
for (File file : filesToDelete) {
4951
if (calculateFolderSize(folder) > maxSizeBytes) {
50-
LogHelper.info("Deleting file: " + file.getName());
52+
LOGGER.get().info("Deleting file: " + file.getName());
5153
file.delete();
5254
}
5355
}
5456
} else {
55-
LogHelper.info("Folder size is within limit. No pruning needed.");
57+
LOGGER.get().info("Folder size is within limit. No pruning needed.");
5658
}
5759
}
5860

src/main/java/org/mangorage/mangobotsite/website/WebServer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
import org.eclipse.jetty.server.handler.ResourceHandler;
88
import org.eclipse.jetty.servlet.ServletContextHandler;
99
import org.eclipse.jetty.util.resource.Resource;
10-
import org.eclipse.jetty.util.ssl.SslContextFactory;
1110
import org.jetbrains.annotations.NotNull;
12-
import org.mangorage.mangobotcore.api.plugin.MangoBotCore;
13-
import org.mangorage.mangobotcore.api.util.log.LogHelper;
11+
import org.mangorage.bootstrap.api.logging.IDeferredMangoLogger;
12+
import org.mangorage.bootstrap.api.logging.ILoggerFactory;
1413
import org.mangorage.mangobotsite.website.filters.RequestInterceptorFilter;
1514
import org.mangorage.mangobotsite.website.handlers.DefaultErrorHandler;
1615
import org.mangorage.mangobotsite.website.servlet.CommandsServlet;
@@ -23,6 +22,8 @@
2322
import java.util.EnumSet;
2423

2524
public final class WebServer {
25+
private static final IDeferredMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j", WebServer.class);
26+
2627
public static final ResolveString WEBPAGE_INTERNAL = new ResolveString("webpage-internal");
2728
public static final ResolveString WEBPAGE_ROOT = new ResolveString("webpage-root");
2829
public static final ResolveString WEBPAGE_PAGE = WEBPAGE_ROOT.resolve("webpage");
@@ -57,7 +58,7 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
5758
server.setHandler(handlers);
5859

5960
server.start();
60-
LogHelper.info("Webserver Started");
61+
LOGGER.get().info("Webserver Started");
6162
server.join();
6263
}
6364

src/main/java/org/mangorage/mangobotsite/website/filters/RequestInterceptorFilter.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@
1010
import jakarta.servlet.http.HttpServletRequest;
1111
import jakarta.servlet.http.HttpServletResponse;
1212
import org.eclipse.jetty.server.Request;
13-
import org.mangorage.mangobotcore.api.util.log.LogHelper;
13+
import org.mangorage.bootstrap.api.logging.IDeferredMangoLogger;
14+
import org.mangorage.bootstrap.api.logging.ILoggerFactory;
1415

1516
import java.io.IOException;
1617

1718

1819
@WebFilter("/*") // Intercept all incoming requests
1920
public final class RequestInterceptorFilter implements Filter {
21+
22+
private static final IDeferredMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j", RequestInterceptorFilter.class);
23+
2024
@Override
2125
public void init(FilterConfig filterConfig) throws ServletException {
2226
// Initialization logic if needed
@@ -27,13 +31,13 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
2731

2832
if (request instanceof Request main) {
2933
var ip = main.getHeader("X-Forwarded-For");
30-
LogHelper.info("Intercepted Request from %s for %s -> https://mangobot.mangorage.org%s".formatted(ip == null ? request.getRemoteAddr() : ip, main.getMethod(), main.getOriginalURI()));
34+
LOGGER.get().info("Intercepted Request from %s for %s -> https://mangobot.mangorage.org%s".formatted(ip == null ? request.getRemoteAddr() : ip, main.getMethod(), main.getOriginalURI()));
3135

3236
} else if (request instanceof HttpServletRequest http) {
3337
var ip = http.getHeader("X-Forwarded-For");
34-
LogHelper.info("Unknown Type (Class) From %s -> %s".formatted(ip == null ? http.getRemoteAddr() : ip, request.getClass()));
38+
LOGGER.get().info("Unknown Type (Class) From %s -> %s".formatted(ip == null ? http.getRemoteAddr() : ip, request.getClass()));
3539
} else {
36-
LogHelper.info("Unknown Type (Class) From %s -> %s".formatted(request.getRemoteAddr(), request.getClass()));
40+
LOGGER.get().info("Unknown Type (Class) From %s -> %s".formatted(request.getRemoteAddr(), request.getClass()));
3741
}
3842

3943
try {

0 commit comments

Comments
 (0)