From 81be032ccfe6d59b52cdf8a4a84dcc7538123052 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sun, 7 Oct 2018 21:51:01 +0300 Subject: [PATCH] [Debt] Updated Network page updating This moves the network page servers tab generation and removes need for network page updates on Bukkit servers, so it was removed. --- .../plan/system/info/BungeeInfoSystem.java | 15 -------- .../plan/system/info/InfoSystem.java | 9 ----- .../plan/system/info/ServerInfoSystem.java | 8 ---- .../request/CacheAnalysisPageRequest.java | 7 ++++ .../request/GenerateAnalysisPageRequest.java | 1 - .../GenerateNetworkPageContentRequest.java | 37 ------------------- .../info/request/InfoRequestFactory.java | 10 ++--- .../request/InfoRequestHandlerFactory.java | 10 ++--- .../system/info/request/InfoRequests.java | 1 - .../processors/info/InfoProcessors.java | 7 +++- .../info/NetworkPageUpdateProcessor.java | 16 ++++---- .../plan/system/tasks/BukkitTaskSystem.java | 1 - .../plan/system/tasks/BungeeTaskSystem.java | 5 --- .../plan/system/tasks/ServerTaskSystem.java | 5 --- .../plan/system/tasks/SpongeTaskSystem.java | 1 - .../tasks/bungee/EnableConnectionTask.java | 36 ------------------ .../tasks/server/NetworkPageRefreshTask.java | 18 ++++----- .../webserver/pages/ServerPageHandler.java | 7 +--- .../utilities/html/pages/NetworkPage.java | 9 +---- 19 files changed, 39 insertions(+), 164 deletions(-) delete mode 100644 Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateNetworkPageContentRequest.java delete mode 100644 Plan/src/main/java/com/djrapitops/plan/system/tasks/bungee/EnableConnectionTask.java diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/BungeeInfoSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/info/BungeeInfoSystem.java index c3d72a45e..a55b39146 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/BungeeInfoSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/BungeeInfoSystem.java @@ -13,9 +13,6 @@ import com.djrapitops.plan.system.info.request.InfoRequest; import com.djrapitops.plan.system.info.request.InfoRequestFactory; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.webserver.WebServer; -import com.djrapitops.plan.system.webserver.cache.PageId; -import com.djrapitops.plan.system.webserver.cache.ResponseCache; -import com.djrapitops.plan.system.webserver.response.ResponseFactory; import com.djrapitops.plugin.logging.console.PluginLogger; import dagger.Lazy; @@ -30,22 +27,15 @@ import javax.inject.Singleton; @Singleton public class BungeeInfoSystem extends InfoSystem { - private final ResponseFactory responseFactory; - private final ServerInfo serverInfo; - @Inject public BungeeInfoSystem( InfoRequestFactory infoRequestFactory, - ResponseFactory responseFactory, ConnectionSystem connectionSystem, ServerInfo serverInfo, Lazy webServer, PluginLogger logger ) { super(infoRequestFactory, connectionSystem, serverInfo, webServer, logger); - this.responseFactory = responseFactory; - - this.serverInfo = serverInfo; } @Override @@ -58,9 +48,4 @@ public class BungeeInfoSystem extends InfoSystem { throw new NoServersException("No servers were available to process this request (Local attempt): " + infoRequest.getClass().getSimpleName()); } } - - @Override - public void updateNetworkPage() { - ResponseCache.cacheResponse(PageId.SERVER.of(serverInfo.getServerUUID()), responseFactory::networkPageResponse); - } } 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 718185834..9ef47c2eb 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 @@ -138,15 +138,6 @@ public abstract class InfoSystem implements SubSystem { return connectionSystem; } - /** - * Updates Network page. - *

- * No calls from non-async thread found on 09.02.2018 - * - * @throws WebException If fails. - */ - public abstract void updateNetworkPage() throws WebException; - /** * Requests Set up from Bungee. *

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 f60973990..633ef1782 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 @@ -27,7 +27,6 @@ import javax.inject.Singleton; @Singleton public class ServerInfoSystem extends InfoSystem { - private final ServerInfo serverInfo; private final PluginLogger logger; @Inject @@ -39,7 +38,6 @@ public class ServerInfoSystem extends InfoSystem { PluginLogger logger ) { super(infoRequestFactory, connectionSystem, serverInfo, webServer, logger); - this.serverInfo = serverInfo; this.logger = logger; } @@ -51,10 +49,4 @@ public class ServerInfoSystem extends InfoSystem { logger.getDebugLogger().logOn(DebugChannels.INFO_REQUESTS, "Local: " + infoRequest.getClass().getSimpleName()); infoRequest.runLocally(); } - - @Override - public void updateNetworkPage() throws WebException { - String html = ""; // TODO Rework this part of the info system - sendRequest(infoRequestFactory.cacheNetworkPageContentRequest(serverInfo.getServerUUID(), html)); - } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java index 769201356..31fb94965 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java @@ -7,6 +7,7 @@ package com.djrapitops.plan.system.info.request; import com.djrapitops.plan.api.exceptions.connection.BadRequestException; import com.djrapitops.plan.api.exceptions.connection.WebException; import com.djrapitops.plan.system.processing.Processing; +import com.djrapitops.plan.system.processing.processors.Processors; import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.webserver.cache.PageId; @@ -30,6 +31,7 @@ public class CacheAnalysisPageRequest extends InfoRequestWithVariables implement private final PlanConfig config; private final Processing processing; + private final Processors processors; private final HtmlExport htmlExport; private UUID serverUUID; @@ -38,10 +40,12 @@ public class CacheAnalysisPageRequest extends InfoRequestWithVariables implement CacheAnalysisPageRequest( PlanConfig config, Processing processing, + Processors processors, HtmlExport htmlExport ) { this.config = config; this.processing = processing; + this.processors = processors; this.htmlExport = htmlExport; } @@ -49,10 +53,12 @@ public class CacheAnalysisPageRequest extends InfoRequestWithVariables implement UUID serverUUID, String html, PlanConfig config, Processing processing, + Processors processors, HtmlExport htmlExport ) { this.config = config; this.processing = processing; + this.processors = processors; this.htmlExport = htmlExport; Verify.nullCheck(serverUUID, html); @@ -76,6 +82,7 @@ public class CacheAnalysisPageRequest extends InfoRequestWithVariables implement private void cache(UUID serverUUID, String html) { ResponseCache.cacheResponse(PageId.SERVER.of(serverUUID), () -> new AnalysisPageResponse(html)); + processing.submitNonCritical(processors.info().networkPageUpdateProcessor()); if (config.isTrue(Settings.ANALYSIS_EXPORT)) { processing.submitNonCritical(() -> htmlExport.exportServer(serverUUID)); diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateAnalysisPageRequest.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateAnalysisPageRequest.java index 7da0a3e37..01dbf9153 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateAnalysisPageRequest.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateAnalysisPageRequest.java @@ -83,7 +83,6 @@ public class GenerateAnalysisPageRequest extends InfoRequestWithVariables implem private void generateAndCache(UUID serverUUID) throws WebException { infoSystem.sendRequest(infoRequestFactory.cacheAnalysisPageRequest(serverUUID, analyseAndGetHtml())); - infoSystem.updateNetworkPage(); } @Override diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateNetworkPageContentRequest.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateNetworkPageContentRequest.java deleted file mode 100644 index 273e15db0..000000000 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateNetworkPageContentRequest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * License is provided in the jar as LICENSE also here: - * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE - */ -package com.djrapitops.plan.system.info.request; - -import com.djrapitops.plan.api.exceptions.connection.WebException; -import com.djrapitops.plan.system.info.InfoSystem; -import com.djrapitops.plan.system.webserver.response.DefaultResponses; -import com.djrapitops.plan.system.webserver.response.Response; - -import java.util.Map; - -/** - * InfoRequest for generating network page content of a Bukkit server. - * - * @author Rsl1122 - */ -public class GenerateNetworkPageContentRequest implements WideRequest, GenerateRequest { - - private final InfoSystem infoSystem; - - GenerateNetworkPageContentRequest(InfoSystem infoSystem) { - this.infoSystem = infoSystem; - } - - @Override - public Response handleRequest(Map variables) throws WebException { - runLocally(); - return DefaultResponses.SUCCESS.get(); - } - - @Override - public void runLocally() throws WebException { - infoSystem.updateNetworkPage(); - } -} diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestFactory.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestFactory.java index a00b3e75a..cca4ddb6f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestFactory.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestFactory.java @@ -5,6 +5,7 @@ import com.djrapitops.plan.system.info.InfoSystem; import com.djrapitops.plan.system.info.connection.ConnectionSystem; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.processing.Processing; +import com.djrapitops.plan.system.processing.processors.Processors; import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.webserver.response.ResponseFactory; import com.djrapitops.plan.utilities.file.export.HtmlExport; @@ -28,6 +29,7 @@ public class InfoRequestFactory { private final Lazy plugin; private final Lazy config; private final Lazy processing; + private final Lazy processors; private final Lazy infoSystem; private final Lazy connectionSystem; private final Lazy serverInfo; @@ -43,6 +45,7 @@ public class InfoRequestFactory { Lazy plugin, Lazy config, Lazy processing, + Lazy processors, Lazy infoSystem, Lazy connectionSystem, Lazy serverInfo, @@ -56,6 +59,7 @@ public class InfoRequestFactory { this.plugin = plugin; this.config = config; this.processing = processing; + this.processors = processors; this.infoSystem = infoSystem; this.connectionSystem = connectionSystem; this.serverInfo = serverInfo; @@ -68,7 +72,7 @@ public class InfoRequestFactory { } public CacheRequest cacheAnalysisPageRequest(UUID serverUUID, String html) { - return new CacheAnalysisPageRequest(serverUUID, html, config.get(), processing.get(), htmlExport.get()); + return new CacheAnalysisPageRequest(serverUUID, html, config.get(), processing.get(), processors.get(), htmlExport.get()); } public CacheRequest cacheInspectPageRequest(UUID uuid, String html) { @@ -95,10 +99,6 @@ public class InfoRequestFactory { return new GenerateInspectPluginsTabRequest(uuid, infoSystem.get(), this, pageFactory.get()); } - public GenerateNetworkPageContentRequest generateNetworkPageContentRequest() { - return new GenerateNetworkPageContentRequest(infoSystem.get()); - } - public SaveDBSettingsRequest saveDBSettingsRequest() { return new SaveDBSettingsRequest(plugin.get(), config.get(), logger.get(), runnableFactory.get()); } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestHandlerFactory.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestHandlerFactory.java index 0d3eefef4..977f55407 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestHandlerFactory.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestHandlerFactory.java @@ -5,6 +5,7 @@ import com.djrapitops.plan.system.info.InfoSystem; import com.djrapitops.plan.system.info.connection.ConnectionSystem; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.processing.Processing; +import com.djrapitops.plan.system.processing.processors.Processors; import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.webserver.response.ResponseFactory; import com.djrapitops.plan.utilities.file.export.HtmlExport; @@ -27,6 +28,7 @@ public class InfoRequestHandlerFactory { private final Lazy plugin; private final Lazy config; private final Lazy processing; + private final Lazy processors; private final Lazy infoSystem; private final Lazy connectionSystem; private final Lazy serverInfo; @@ -42,6 +44,7 @@ public class InfoRequestHandlerFactory { Lazy plugin, Lazy config, Lazy processing, + Lazy processors, Lazy infoSystem, Lazy connectionSystem, Lazy serverInfo, @@ -55,6 +58,7 @@ public class InfoRequestHandlerFactory { this.plugin = plugin; this.config = config; this.processing = processing; + this.processors = processors; this.infoSystem = infoSystem; this.connectionSystem = connectionSystem; this.serverInfo = serverInfo; @@ -67,7 +71,7 @@ public class InfoRequestHandlerFactory { } CacheRequest cacheAnalysisPageRequest() { - return new CacheAnalysisPageRequest(config.get(), processing.get(), htmlExport.get()); + return new CacheAnalysisPageRequest(config.get(), processing.get(), processors.get(), htmlExport.get()); } CacheRequest cacheInspectPageRequest() { @@ -98,10 +102,6 @@ public class InfoRequestHandlerFactory { return new GenerateInspectPluginsTabRequest(infoSystem.get(), infoRequestFactory.get(), pageFactory.get()); } - GenerateRequest generateNetworkPageContentRequest() { - return new GenerateNetworkPageContentRequest(infoSystem.get()); - } - SetupRequest saveDBSettingsRequest() { return new SaveDBSettingsRequest(plugin.get(), config.get(), logger.get(), runnableFactory.get()); } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequests.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequests.java index 5556249e1..4ef8726b1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequests.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequests.java @@ -30,7 +30,6 @@ public class InfoRequests extends HashMap { putRequest(handlers.generateAnalysisPageRequest()); putRequest(handlers.generateInspectPageRequest()); putRequest(handlers.generateInspectPluginsTabRequest()); - putRequest(handlers.generateNetworkPageContentRequest()); putRequest(handlers.saveDBSettingsRequest()); putRequest(handlers.sendDBSettingsRequest()); diff --git a/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/InfoProcessors.java b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/InfoProcessors.java index 07b815c02..98825d1d5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/InfoProcessors.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/InfoProcessors.java @@ -2,6 +2,7 @@ package com.djrapitops.plan.system.processing.processors.info; import com.djrapitops.plan.system.info.InfoSystem; import com.djrapitops.plan.system.info.connection.WebExceptionLogger; +import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plugin.command.Sender; import com.djrapitops.plugin.task.RunnableFactory; import dagger.Lazy; @@ -19,16 +20,18 @@ import java.util.function.BiConsumer; @Singleton public class InfoProcessors { + private final Lazy serverInfo; private final Lazy infoSystem; private final Lazy webExceptionLogger; private final Lazy runnableFactory; @Inject public InfoProcessors( - Lazy infoSystem, + Lazy serverInfo, Lazy infoSystem, Lazy webExceptionLogger, Lazy runnableFactory ) { + this.serverInfo = serverInfo; this.infoSystem = infoSystem; this.webExceptionLogger = webExceptionLogger; this.runnableFactory = runnableFactory; @@ -46,7 +49,7 @@ public class InfoProcessors { } public NetworkPageUpdateProcessor networkPageUpdateProcessor() { - return new NetworkPageUpdateProcessor(infoSystem.get(), webExceptionLogger.get()); + return new NetworkPageUpdateProcessor(serverInfo.get()); } public PlayerPageUpdateProcessor playerPageUpdateProcessor(UUID uuid) { diff --git a/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/NetworkPageUpdateProcessor.java b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/NetworkPageUpdateProcessor.java index 318c3ed0e..961bf0fd5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/NetworkPageUpdateProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/info/NetworkPageUpdateProcessor.java @@ -4,8 +4,9 @@ */ package com.djrapitops.plan.system.processing.processors.info; -import com.djrapitops.plan.system.info.InfoSystem; -import com.djrapitops.plan.system.info.connection.WebExceptionLogger; +import com.djrapitops.plan.system.info.server.ServerInfo; +import com.djrapitops.plan.system.webserver.cache.PageId; +import com.djrapitops.plan.system.webserver.cache.ResponseCache; /** * Processor for updating the network page. @@ -14,19 +15,16 @@ import com.djrapitops.plan.system.info.connection.WebExceptionLogger; */ public class NetworkPageUpdateProcessor implements Runnable { - private final InfoSystem infoSystem; - private final WebExceptionLogger webExceptionLogger; + private final ServerInfo serverInfo; NetworkPageUpdateProcessor( - InfoSystem infoSystem, - WebExceptionLogger webExceptionLogger + ServerInfo serverInfo ) { - this.infoSystem = infoSystem; - this.webExceptionLogger = webExceptionLogger; + this.serverInfo = serverInfo; } @Override public void run() { - webExceptionLogger.logIfOccurs(this.getClass(), infoSystem::updateNetworkPage); + ResponseCache.clearResponse(PageId.SERVER.of(serverInfo.getServerUUID())); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/BukkitTaskSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/BukkitTaskSystem.java index 1f7858cb6..c28935a8e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/BukkitTaskSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/BukkitTaskSystem.java @@ -40,7 +40,6 @@ public class BukkitTaskSystem extends ServerTaskSystem { runnableFactory, Check.isPaperAvailable() ? paperTPSCountTimer : bukkitTPSCountTimer, config, - networkPageRefreshTask, bootAnalysisTask, periodicAnalysisTask, logsFolderCleanTask diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/BungeeTaskSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/BungeeTaskSystem.java index 65eab8d80..dedced3cd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/BungeeTaskSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/BungeeTaskSystem.java @@ -5,7 +5,6 @@ package com.djrapitops.plan.system.tasks; import com.djrapitops.plan.system.tasks.bungee.BungeeTPSCountTimer; -import com.djrapitops.plan.system.tasks.bungee.EnableConnectionTask; import com.djrapitops.plan.system.tasks.server.NetworkPageRefreshTask; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.task.RunnableFactory; @@ -20,7 +19,6 @@ import java.util.concurrent.TimeUnit; */ public class BungeeTaskSystem extends TaskSystem { - private final EnableConnectionTask enableConnectionTask; private final NetworkPageRefreshTask networkPageRefreshTask; private final LogsFolderCleanTask logsFolderCleanTask; @@ -28,13 +26,11 @@ public class BungeeTaskSystem extends TaskSystem { public BungeeTaskSystem( RunnableFactory runnableFactory, BungeeTPSCountTimer bungeeTPSCountTimer, - EnableConnectionTask enableConnectionTask, NetworkPageRefreshTask networkPageRefreshTask, LogsFolderCleanTask logsFolderCleanTask ) { super(runnableFactory, bungeeTPSCountTimer); - this.enableConnectionTask = enableConnectionTask; this.networkPageRefreshTask = networkPageRefreshTask; this.logsFolderCleanTask = logsFolderCleanTask; } @@ -45,7 +41,6 @@ public class BungeeTaskSystem extends TaskSystem { } private void registerTasks() { - registerTask(enableConnectionTask).runTaskAsynchronously(); registerTask(tpsCountTimer).runTaskTimerAsynchronously(1000, TimeAmount.toTicks(1L, TimeUnit.SECONDS)); registerTask(networkPageRefreshTask).runTaskTimerAsynchronously(1500, TimeAmount.toTicks(5L, TimeUnit.MINUTES)); registerTask(logsFolderCleanTask).runTaskLaterAsynchronously(TimeAmount.toTicks(30L, TimeUnit.SECONDS)); diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/ServerTaskSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/ServerTaskSystem.java index bc481c968..aec7e0bc8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/ServerTaskSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/ServerTaskSystem.java @@ -3,7 +3,6 @@ package com.djrapitops.plan.system.tasks; import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.tasks.server.BootAnalysisTask; -import com.djrapitops.plan.system.tasks.server.NetworkPageRefreshTask; import com.djrapitops.plan.system.tasks.server.PeriodicAnalysisTask; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.task.RunnableFactory; @@ -18,7 +17,6 @@ import java.util.concurrent.TimeUnit; public abstract class ServerTaskSystem extends TaskSystem { private final PlanConfig config; - private final NetworkPageRefreshTask networkPageRefreshTask; private final BootAnalysisTask bootAnalysisTask; private final PeriodicAnalysisTask periodicAnalysisTask; private final LogsFolderCleanTask logsFolderCleanTask; @@ -27,13 +25,11 @@ public abstract class ServerTaskSystem extends TaskSystem { RunnableFactory runnableFactory, TPSCountTimer tpsCountTimer, PlanConfig config, - NetworkPageRefreshTask networkPageRefreshTask, BootAnalysisTask bootAnalysisTask, PeriodicAnalysisTask periodicAnalysisTask, LogsFolderCleanTask logsFolderCleanTask) { super(runnableFactory, tpsCountTimer); this.config = config; - this.networkPageRefreshTask = networkPageRefreshTask; this.bootAnalysisTask = bootAnalysisTask; this.periodicAnalysisTask = periodicAnalysisTask; this.logsFolderCleanTask = logsFolderCleanTask; @@ -51,7 +47,6 @@ public abstract class ServerTaskSystem extends TaskSystem { long analysisPeriod = TimeAmount.toTicks(analysisRefreshMinutes, TimeUnit.MINUTES); registerTask(tpsCountTimer).runTaskTimer(1000, TimeAmount.toTicks(1L, TimeUnit.SECONDS)); - registerTask(networkPageRefreshTask).runTaskTimerAsynchronously(20L, TimeAmount.toTicks(5L, TimeUnit.MINUTES)); registerTask(bootAnalysisTask).runTaskLaterAsynchronously(TimeAmount.toTicks(30L, TimeUnit.SECONDS)); if (analysisRefreshTaskIsEnabled) { diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/SpongeTaskSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/SpongeTaskSystem.java index 1f223a828..a00c35a43 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/SpongeTaskSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/SpongeTaskSystem.java @@ -31,7 +31,6 @@ public class SpongeTaskSystem extends ServerTaskSystem { runnableFactory, spongeTPSCountTimer, config, - networkPageRefreshTask, bootAnalysisTask, periodicAnalysisTask, logsFolderCleanTask diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/bungee/EnableConnectionTask.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/bungee/EnableConnectionTask.java deleted file mode 100644 index 3b93d1efb..000000000 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/bungee/EnableConnectionTask.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.djrapitops.plan.system.tasks.bungee; - -import com.djrapitops.plan.system.info.connection.ConnectionSystem; -import com.djrapitops.plan.system.info.connection.WebExceptionLogger; -import com.djrapitops.plan.system.info.request.InfoRequestFactory; -import com.djrapitops.plugin.task.AbsRunnable; - -import javax.inject.Inject; -import javax.inject.Singleton; - -@Singleton -public class EnableConnectionTask extends AbsRunnable { - - private ConnectionSystem connectionSystem; - private final InfoRequestFactory infoRequestFactory; - private final WebExceptionLogger webExceptionLogger; - - @Inject - public EnableConnectionTask( - ConnectionSystem connectionSystem, - InfoRequestFactory infoRequestFactory, - WebExceptionLogger webExceptionLogger - ) { - this.connectionSystem = connectionSystem; - this.infoRequestFactory = infoRequestFactory; - this.webExceptionLogger = webExceptionLogger; - } - - @Override - public void run() { - webExceptionLogger.logIfOccurs(this.getClass(), - () -> connectionSystem.sendWideInfoRequest(infoRequestFactory.generateNetworkPageContentRequest()) - ); - cancel(); - } -} diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/NetworkPageRefreshTask.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/NetworkPageRefreshTask.java index 6c03b31cd..c9cf5d409 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/NetworkPageRefreshTask.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/NetworkPageRefreshTask.java @@ -1,7 +1,8 @@ package com.djrapitops.plan.system.tasks.server; -import com.djrapitops.plan.system.info.InfoSystem; -import com.djrapitops.plan.system.info.connection.WebExceptionLogger; +import com.djrapitops.plan.system.info.server.ServerInfo; +import com.djrapitops.plan.system.webserver.cache.PageId; +import com.djrapitops.plan.system.webserver.cache.ResponseCache; import com.djrapitops.plugin.task.AbsRunnable; import javax.inject.Inject; @@ -10,20 +11,15 @@ import javax.inject.Singleton; @Singleton public class NetworkPageRefreshTask extends AbsRunnable { - private InfoSystem infoSystem; - private final WebExceptionLogger webExceptionLogger; + private final ServerInfo serverInfo; @Inject - public NetworkPageRefreshTask( - InfoSystem infoSystem, - WebExceptionLogger webExceptionLogger - ) { - this.infoSystem = infoSystem; - this.webExceptionLogger = webExceptionLogger; + public NetworkPageRefreshTask(ServerInfo serverInfo) { + this.serverInfo = serverInfo; } @Override public void run() { - webExceptionLogger.logIfOccurs(this.getClass(), () -> infoSystem.updateNetworkPage()); + ResponseCache.clearResponse(PageId.SERVER.of(serverInfo.getServerUUID())); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java index d0ddc904e..2d05e9fe0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/ServerPageHandler.java @@ -70,12 +70,7 @@ public class ServerPageHandler implements PageHandler { return response; } else { if (Check.isBungeeAvailable() && serverInfo.getServerUUID().equals(serverUUID)) { - try { - infoSystem.updateNetworkPage(); - } catch (WebException e) { - /*Ignore, should not occur*/ - } - return ResponseCache.loadResponse(PageId.SERVER.of(serverUUID)); + return ResponseCache.loadResponse(PageId.SERVER.of(serverUUID), responseFactory::networkPageResponse); } return refreshNow(serverUUID); } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java index 6c87ed2a0..5ea0ce2e5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java @@ -9,9 +9,6 @@ import com.djrapitops.plan.data.store.containers.NetworkContainer; import com.djrapitops.plan.data.store.keys.NetworkKeys; import com.djrapitops.plan.system.file.PlanFiles; import com.djrapitops.plan.system.info.server.properties.ServerProperties; -import com.djrapitops.plan.system.webserver.cache.PageId; -import com.djrapitops.plan.system.webserver.cache.ResponseCache; -import com.djrapitops.plan.system.webserver.response.pages.parts.NetworkPageContent; import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; import static com.djrapitops.plan.data.store.keys.NetworkKeys.*; @@ -54,11 +51,9 @@ public class NetworkPage implements Page { WORLD_MAP_SERIES, WORLD_MAP_HIGH_COLOR, WORLD_MAP_LOW_COLOR, COUNTRY_CATEGORIES, COUNTRY_SERIES, HEALTH_INDEX, HEALTH_NOTES, - ACTIVITY_PIE_SERIES, ACTIVITY_STACK_SERIES, ACTIVITY_STACK_CATEGORIES + ACTIVITY_PIE_SERIES, ACTIVITY_STACK_SERIES, ACTIVITY_STACK_CATEGORIES, + SERVERS_TAB ); - NetworkPageContent networkPageContent = (NetworkPageContent) - ResponseCache.loadResponse(PageId.NETWORK_CONTENT.id(), NetworkPageContent::new); - placeholderReplacer.put("tabContentServers", networkPageContent.getContents()); return placeholderReplacer.apply(files.readCustomizableResourceFlat("web/network.html")); } catch (Exception e) {