Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-06 18:50:54 +01:00
Code Issues Projects Releases Wiki Activity

Re-order cleanup on disable, clean up metrics too.

Browse Source
This commit is contained in:
asofold 2012-12-02 17:39:50 +01:00
parent 2e9608c056
commit 2f482649a0
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/fr/neatmonster/nocheatplus/NoCheatPlus.java
View File

@ -220,6 +220,8 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
protected final List<PermStateReceiver> permStateReceivers = new ArrayList<PermStateReceiver>(); protected final List<PermStateReceiver> permStateReceivers = new ArrayList<PermStateReceiver>();
protected Metrics metrics = null;
/** /**
* Interfaces checked for managed listeners: IHaveMethodOrder (method), ComponentWithName (tag)<br> * Interfaces checked for managed listeners: IHaveMethodOrder (method), ComponentWithName (tag)<br>
*/ */
@ -299,12 +301,22 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
* | |_| | \__ \ (_| | |_) | | __/ * | |_| | \__ \ (_| | |_) | | __/
* |____/|_|___/\__,_|_.__/|_|\___| * |____/|_|___/\__,_|_.__/|_|\___|
*/ */
final PluginDescriptionFile pdfFile = getDescription();
// Remove listener references.
listenerManager.setRegisterDirectly(false);
listenerManager.clear();
// Stop the tickTask. // Stop the tickTask.
TickTask.setLocked(true); TickTask.setLocked(true);
TickTask.purge();
TickTask.cancel(); TickTask.cancel();
// Stop metrics task.
if (metrics != null){
metrics.cancel();
metrics = null;
}
// Stop the lag measuring task. // Stop the lag measuring task.
LagMeasureTask.cancel(); LagMeasureTask.cancel();
@ -328,14 +340,8 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
// Cleanup the configuration manager. // Cleanup the configuration manager.
ConfigManager.cleanup(); ConfigManager.cleanup();
// Remove listener references.
listenerManager.setRegisterDirectly(false);
listenerManager.clear();
// More cleanup.
TickTask.purge();
// Tell the server administrator the we finished unloading NoCheatPlus. // Tell the server administrator the we finished unloading NoCheatPlus.
final PluginDescriptionFile pdfFile = getDescription();
LogUtil.logInfo("[NoCheatPlus] Version " + pdfFile.getVersion() + " is disabled."); LogUtil.logInfo("[NoCheatPlus] Version " + pdfFile.getVersion() + " is disabled.");
} }
@ -446,7 +452,7 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
if (config.getBoolean(ConfPaths.MISCELLANEOUS_REPORTTOMETRICS)) { if (config.getBoolean(ConfPaths.MISCELLANEOUS_REPORTTOMETRICS)) {
MetricsData.initialize(); MetricsData.initialize();
try { try {
final Metrics metrics = new Metrics(this); this.metrics = new Metrics(this);
final Graph checksFailed = metrics.createGraph("Checks Failed"); final Graph checksFailed = metrics.createGraph("Checks Failed");
for (final CheckType type : CheckType.values()) for (final CheckType type : CheckType.values())
if (type.getParent() != null) if (type.getParent() != null)
@ -469,7 +475,14 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
} }
}); });
metrics.start(); metrics.start();
} catch (final Exception e) {} } catch (final Exception e) {
LogUtil.logWarning("[NoCheatPlus] Failed to initialize metrics:");
LogUtil.logWarning(e);
if (metrics != null){
metrics.cancel();
metrics = null;
}
}
} }
// if (config.getBoolean(ConfPaths.MISCELLANEOUS_CHECKFORUPDATES)){ // if (config.getBoolean(ConfPaths.MISCELLANEOUS_CHECKFORUPDATES)){