Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-12 06:48:50 +02:00
Code Issues Projects Releases Wiki Activity

Prevented some error logs on reload

Browse Source
This commit is contained in:
Rsl1122 2018-02-11 14:36:47 +02:00
parent 2b7f194d37
commit ea873f798e
3 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/src/main/java/com/djrapitops/plan/system/settings/theme/Theme.java
View File

@ -4,6 +4,7 @@
*/
package com.djrapitops.plan.system.settings.theme;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.system.SubSystem;
import com.djrapitops.plan.system.settings.Settings;
@ -69,6 +70,10 @@ public class Theme implements SubSystem {
} else {
return value;
}
} catch (IllegalStateException e) {
if (!PlanPlugin.getInstance().isReloading()) {
Log.error("Something went wrong with getting variable " + variable.name() + " for: " + path);
}
} catch (Exception | NoSuchFieldError e) {
Log.error("Something went wrong with getting variable " + variable.name() + " for: " + path);
}

22
Plan/src/main/java/com/djrapitops/plan/system/tasks/bukkit/BootAnalysisTask.java
View File

@ -1,5 +1,6 @@
package com.djrapitops.plan.system.tasks.bukkit;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.system.info.InfoSystem;
import com.djrapitops.plan.system.info.connection.WebExceptionLogger;
import com.djrapitops.plan.system.info.request.GenerateAnalysisPageRequest;
@ -18,13 +19,20 @@ public class BootAnalysisTask extends AbsRunnable {
@Override
public void run() {
String bootAnalysisRunMsg = Locale.get(Msg.ENABLE_BOOT_ANALYSIS_RUN_INFO).toString();
Log.info(bootAnalysisRunMsg);
if (!Analysis.isAnalysisBeingRun()) {
WebExceptionLogger.logIfOccurs(this.getClass(), () ->
InfoSystem.getInstance().sendRequest(new GenerateAnalysisPageRequest(ServerInfo.getServerUUID()))
);
try {
String bootAnalysisRunMsg = Locale.get(Msg.ENABLE_BOOT_ANALYSIS_RUN_INFO).toString();
Log.info(bootAnalysisRunMsg);
if (!Analysis.isAnalysisBeingRun()) {
WebExceptionLogger.logIfOccurs(this.getClass(), () ->
InfoSystem.getInstance().sendRequest(new GenerateAnalysisPageRequest(ServerInfo.getServerUUID()))
);
}
} catch (IllegalStateException e) {
if (!PlanPlugin.getInstance().isReloading()) {
Log.toLog(this.getClass(), e);
}
} finally {
cancel();
}
cancel();
}
}

18
Plan/src/main/java/com/djrapitops/plan/system/tasks/bukkit/PeriodicAnalysisTask.java
View File

@ -1,10 +1,12 @@
package com.djrapitops.plan.system.tasks.bukkit;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.system.info.InfoSystem;
import com.djrapitops.plan.system.info.connection.WebExceptionLogger;
import com.djrapitops.plan.system.info.request.GenerateAnalysisPageRequest;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.utilities.analysis.Analysis;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.task.AbsRunnable;
public class PeriodicAnalysisTask extends AbsRunnable {
@ -15,10 +17,18 @@ public class PeriodicAnalysisTask extends AbsRunnable {
@Override
public void run() {
if (!Analysis.isAnalysisBeingRun()) {
WebExceptionLogger.logIfOccurs(this.getClass(), () ->
InfoSystem.getInstance().sendRequest(new GenerateAnalysisPageRequest(ServerInfo.getServerUUID()))
);
try {
if (!Analysis.isAnalysisBeingRun()) {
WebExceptionLogger.logIfOccurs(this.getClass(), () ->
InfoSystem.getInstance().sendRequest(new GenerateAnalysisPageRequest(ServerInfo.getServerUUID()))
);
}
} catch (IllegalStateException e) {
if (!PlanPlugin.getInstance().isReloading()) {
Log.toLog(this.getClass(), e);
}
} finally {
cancel();
}
}
}