From c25866e99ace08f259f17248251467b0fe476ce7 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Tue, 3 Apr 2018 10:49:26 +0300 Subject: [PATCH] Removed force refresh from player page #553 --- .../plan/system/cache/SessionCache.java | 7 ------ .../bukkit/PlayerOnlineListener.java | 6 ++++- .../info/PlayerPageUpdateProcessor.java | 22 +++++++++++++++++++ .../response/pages/InspectPageResponse.java | 2 +- 4 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/PlayerPageUpdateProcessor.java diff --git a/Plan/src/main/java/com/djrapitops/plan/system/cache/SessionCache.java b/Plan/src/main/java/com/djrapitops/plan/system/cache/SessionCache.java index e65a32ef6..4ef2ae31c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/cache/SessionCache.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/cache/SessionCache.java @@ -4,8 +4,6 @@ import com.djrapitops.plan.api.exceptions.database.DBException; import com.djrapitops.plan.data.container.Session; import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.database.databases.Database; -import com.djrapitops.plan.system.info.connection.WebExceptionLogger; -import com.djrapitops.plan.system.processing.Processing; import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; @@ -54,9 +52,6 @@ public class SessionCache { public void cacheSession(UUID uuid, Session session) { activeSessions.put(uuid, session); - Processing.submitNonCritical(() -> WebExceptionLogger.logIfOccurs(this.getClass(), () -> - system.getInfoSystem().generateAndCachePlayerPage(uuid)) - ); } public void endSession(UUID uuid, long time) { @@ -71,8 +66,6 @@ public class SessionCache { Log.toLog(this.getClass(), e); } finally { activeSessions.remove(uuid); - - WebExceptionLogger.logIfOccurs(this.getClass(), () -> system.getInfoSystem().generateAndCachePlayerPage(uuid)); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java b/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java index 6dad503a2..0c4037644 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java @@ -4,6 +4,7 @@ import com.djrapitops.plan.data.container.Session; import com.djrapitops.plan.system.cache.SessionCache; import com.djrapitops.plan.system.processing.Processing; import com.djrapitops.plan.system.processing.processors.info.NetworkPageUpdateProcessor; +import com.djrapitops.plan.system.processing.processors.info.PlayerPageUpdateProcessor; import com.djrapitops.plan.system.processing.processors.player.*; import com.djrapitops.plan.system.tasks.TaskSystem; import com.djrapitops.plan.utilities.MiscUtils; @@ -99,7 +100,8 @@ public class PlayerOnlineListener implements Listener { Processing.submit( new RegisterProcessor(uuid, player.getFirstPlayed(), time, playerName, playersOnline, new IPUpdateProcessor(uuid, ip, time), - new NameProcessor(uuid, playerName, displayName) + new NameProcessor(uuid, playerName, displayName), + new PlayerPageUpdateProcessor(uuid) ) ); Processing.submit(new NetworkPageUpdateProcessor()); @@ -131,6 +133,8 @@ public class PlayerOnlineListener implements Listener { int messagesSent = sessionCache.getFirstSessionMsgCount(uuid); Processing.submit(new FirstLeaveProcessor(uuid, time, messagesSent)); } + + Processing.submit(new PlayerPageUpdateProcessor(uuid)); } catch (Exception e) { Log.toLog(this.getClass(), e); } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/PlayerPageUpdateProcessor.java b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/PlayerPageUpdateProcessor.java new file mode 100644 index 000000000..df386e77d --- /dev/null +++ b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/PlayerPageUpdateProcessor.java @@ -0,0 +1,22 @@ +package com.djrapitops.plan.system.processing.processors.info; + +import com.djrapitops.plan.system.info.InfoSystem; +import com.djrapitops.plan.system.info.connection.WebExceptionLogger; + +import java.util.UUID; + +public class PlayerPageUpdateProcessor implements Runnable { + + private final UUID uuid; + + public PlayerPageUpdateProcessor(UUID uuid) { + this.uuid = uuid; + } + + @Override + public void run() { + WebExceptionLogger.logIfOccurs(this.getClass(), + () -> InfoSystem.getInstance().generateAndCachePlayerPage(uuid) + ); + } +} diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/InspectPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/InspectPageResponse.java index 1ce21334e..a072ee71c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/InspectPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/InspectPageResponse.java @@ -39,7 +39,7 @@ public class InspectPageResponse extends Response { } private String[] getCalculating() { - return new String[]{"
  • Calculating...
  • ", ""}; + return new String[]{"
  • Calculating...
  • ", ""}; } public static InspectPageResponse getRefreshing() {