From 6ca86b8c768a6b678a950144ed5e99835ef97280 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Sat, 29 Sep 2018 14:44:23 +0300
Subject: [PATCH] [Debug] Improved debug channel usage

---
 .../java/com/djrapitops/plan/system/info/InfoSystem.java    | 4 ++--
 .../com/djrapitops/plan/system/info/ServerInfoSystem.java   | 3 ++-
 .../djrapitops/plan/system/webserver/RequestHandler.java    | 6 +++++-
 .../com/djrapitops/plan/utilities/html/pages/DebugPage.java | 5 ++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/InfoSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/info/InfoSystem.java
index 99e871d6a..718185834 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/info/InfoSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/InfoSystem.java
@@ -99,14 +99,14 @@ public abstract class InfoSystem implements SubSystem {
     public void sendRequest(InfoRequest infoRequest) throws WebException {
         try {
             if (!connectionSystem.isServerAvailable()) {
-                logger.debug(DebugChannels.INFO_REQUESTS, "Main server unavailable, running locally.");
+                logger.getDebugLogger().logOn(DebugChannels.INFO_REQUESTS, "Main server unavailable, running locally.");
                 runLocally(infoRequest);
                 return;
             }
             connectionSystem.sendInfoRequest(infoRequest);
         } catch (WebException original) {
             try {
-                logger.debug(DebugChannels.INFO_REQUESTS, "Exception during request: " + original.toString() + ", running locally.");
+                logger.getDebugLogger().logOn(DebugChannels.INFO_REQUESTS, "Exception during request: " + original.toString() + ", running locally.");
                 runLocally(infoRequest);
             } catch (NoServersException e2) {
                 throw original;
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/ServerInfoSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/info/ServerInfoSystem.java
index 528104ea1..3cedc8117 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/info/ServerInfoSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/ServerInfoSystem.java
@@ -6,6 +6,7 @@ package com.djrapitops.plan.system.info;
 
 import com.djrapitops.plan.api.exceptions.connection.NoServersException;
 import com.djrapitops.plan.api.exceptions.connection.WebException;
+import com.djrapitops.plan.system.DebugChannels;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;
 import com.djrapitops.plan.system.info.request.InfoRequest;
 import com.djrapitops.plan.system.info.request.InfoRequestFactory;
@@ -48,7 +49,7 @@ public class ServerInfoSystem extends InfoSystem {
         if (infoRequest instanceof SetupRequest) {
             throw new NoServersException("Set-up requests can not be run locally.");
         }
-        logger.debug("LocalRun: " + infoRequest.getClass().getSimpleName());
+        logger.getDebugLogger().logOn(DebugChannels.INFO_REQUESTS, "Local: " + infoRequest.getClass().getSimpleName());
         infoRequest.runLocally();
     }
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java
index efc224848..90b52e32c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java
@@ -4,6 +4,7 @@
  */
 package com.djrapitops.plan.system.webserver;
 
+import com.djrapitops.plan.system.DebugChannels;
 import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.Settings;
@@ -94,7 +95,10 @@ public class RequestHandler implements HttpHandler {
         } finally {
             exchange.close();
             if (inDevMode) {
-                logger.debug(requestString + " Response code: " + responseCode + timings.end(requestString).map(Benchmark::toString).orElse("-"));
+                logger.getDebugLogger().logOn(
+                        DebugChannels.WEB_REQUESTS,
+                        timings.end(requestString).map(Benchmark::toString).orElse("-") + " Code: " + responseCode
+                );
             }
         }
     }
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java
index 557a10f96..00a742904 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java
@@ -301,7 +301,10 @@ public class DebugPage implements Page {
 
         TabsElement.Tab[] tabs = channels.entrySet().stream()
                 .sorted((one, two) -> String.CASE_INSENSITIVE_ORDER.compare(one.getKey(), two.getKey()))
-                .map(channel -> new TabsElement.Tab(channel.getKey(), debugChannelContent(channel.getKey(), channel.getValue())))
+                .map(channel -> {
+                    String name = channel.getKey().isEmpty() ? "Default" : channel.getKey();
+                    return new TabsElement.Tab(name, debugChannelContent(name, channel.getValue()));
+                })
                 .toArray(TabsElement.Tab[]::new);
 
         content.append(new TabsElement(tabs).toHtmlFull());