From cdc4f36f2eca1fd3b40b58d273ac70a729db23d3 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Fri, 23 Feb 2018 19:03:14 +0200 Subject: [PATCH] More debug logs for different connections (b2) --- .../com/djrapitops/plan/system/info/BukkitInfoSystem.java | 2 ++ .../plan/system/info/connection/ConnectionLog.java | 7 ++++++- .../plan/system/info/connection/ConnectionOut.java | 1 - Plan/src/main/resources/bungee.yml | 2 +- Plan/src/main/resources/plugin.yml | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/BukkitInfoSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/info/BukkitInfoSystem.java index 3818e46b8..3bb0b4b85 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/BukkitInfoSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/BukkitInfoSystem.java @@ -12,6 +12,7 @@ import com.djrapitops.plan.system.info.request.InfoRequest; import com.djrapitops.plan.system.info.request.SetupRequest; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.utilities.html.HtmlStructure; +import com.djrapitops.plugin.api.utility.log.Log; /** * InfoSystem for Bukkit servers. @@ -29,6 +30,7 @@ public class BukkitInfoSystem extends InfoSystem { if (infoRequest instanceof SetupRequest) { throw new NoServersException("Set-up requests can not be run locally."); } + Log.debug("LocalRun: " + infoRequest.getClass().getSimpleName()); infoRequest.runLocally(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java index 1064d5ff0..1bb5ccdb6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java @@ -7,6 +7,7 @@ package com.djrapitops.plan.system.info.connection; import com.djrapitops.plan.system.info.request.InfoRequest; import com.djrapitops.plan.system.info.server.Server; import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plugin.api.utility.log.Log; import java.util.HashMap; import java.util.Map; @@ -34,11 +35,15 @@ public class ConnectionLog { } public static void logConnectionTo(Server server, InfoRequest request, int responseCode) { - logConnection(server.getWebAddress(), "Out: " + request.getClass().getSimpleName(), responseCode); + String requestName = request.getClass().getSimpleName(); + String address = server.getWebAddress(); + logConnection(address, "Out: " + requestName, responseCode); + Log.debug("ConnectionOut: " + requestName + " to " + address); } public static void logConnectionFrom(String server, String requestTarget, int responseCode) { logConnection(server, "In: " + requestTarget, responseCode); + Log.debug("ConnectionIn: " + requestTarget + " from " + server); } private static void logConnection(String address, String infoRequestName, int responseCode) { diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java index 0e556df65..18d51f64c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java @@ -113,7 +113,6 @@ public class ConnectionOut { byte[] toSend = parameters.getBytes(); connection.setUseCaches(false); - Log.debug("ConnectionOut: " + infoRequest.getClass().getSimpleName() + " to " + address); try (DataOutputStream out = new DataOutputStream(connection.getOutputStream())) { out.write(toSend); } diff --git a/Plan/src/main/resources/bungee.yml b/Plan/src/main/resources/bungee.yml index 050ee6b39..0c9185359 100644 --- a/Plan/src/main/resources/bungee.yml +++ b/Plan/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: Plan author: Rsl1122 main: com.djrapitops.plan.PlanBungee -version: 4.1.6-b1 \ No newline at end of file +version: 4.1.6-b2 \ No newline at end of file diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml index e536d3362..4d30c0761 100644 --- a/Plan/src/main/resources/plugin.yml +++ b/Plan/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Plan author: Rsl1122 main: com.djrapitops.plan.Plan -version: 4.1.6-b1 +version: 4.1.6-b2 softdepend: - EssentialsX - Towny