mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-07 17:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move setupFilter() to RegisterCommand constructor

Browse Source
This commit is contained in:
Fuzzlemann 2017-09-02 01:28:16 +02:00
parent fe1329eef0
commit 2c156fd29a
7 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Plan/src/main/java/com/djrapitops/plan/Plan.java
View File

@ -30,7 +30,6 @@ import main.java.com.djrapitops.plan.api.API;
import main.java.com.djrapitops.plan.api.IPlan;
import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException;
import main.java.com.djrapitops.plan.command.PlanCommand;
import main.java.com.djrapitops.plan.command.commands.RegisterCommandFilter;
import main.java.com.djrapitops.plan.data.additional.HookHandler;
import main.java.com.djrapitops.plan.database.Database;
import main.java.com.djrapitops.plan.database.databases.MySQLDB;
@ -47,7 +46,6 @@ import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer;
import main.java.com.djrapitops.plan.systems.webserver.PageCache;
import main.java.com.djrapitops.plan.systems.webserver.WebServer;
import main.java.com.djrapitops.plan.utilities.Benchmark;
import org.apache.logging.log4j.LogManager;
import org.bukkit.ChatColor;
import java.util.HashSet;
@ -172,8 +170,6 @@ public class Plan extends BukkitPlugin<Plan> implements IPlan {
this.api = new API(this);
setupFilter(); // TODO Move to RegisterCommand Constructor
// Data view settings // TODO Rewrite. (TextUI removed & webServer might be running on bungee
boolean usingAlternativeIP = Settings.SHOW_ALTERNATIVE_IP.isTrue();
boolean hasDataViewCapability = usingAlternativeIP;
@ -212,14 +208,15 @@ public class Plan extends BukkitPlugin<Plan> implements IPlan {
Benchmark.start("Task Registration");
tpsCountTimer = new TPSCountTimer(this);
runnableFactory.createNew(tpsCountTimer).runTaskTimer(1000, TimeAmount.SECOND.ticks());
// Analysis refresh settings
int analysisRefreshMinutes = Settings.ANALYSIS_AUTO_REFRESH.getNumber();
boolean analysisRefreshTaskIsEnabled = analysisRefreshMinutes > 0;
long analysisPeriod = analysisRefreshMinutes * TimeAmount.MINUTE.ticks();
Log.info(bootAnalysisMsg);
ITask bootAnalysisTask = runnableFactory.createNew("BootAnalysisTask", new AbsRunnable() {
@Override
public void run() {
@ -228,7 +225,9 @@ public class Plan extends BukkitPlugin<Plan> implements IPlan {
this.cancel();
}
}).runTaskLaterAsynchronously(30 * TimeAmount.SECOND.ticks());
bootAnalysisTaskID = bootAnalysisTask.getTaskId();
if (analysisRefreshTaskIsEnabled) {
runnableFactory.createNew("PeriodicalAnalysisTask", new AbsRunnable() {
@Override
@ -237,6 +236,7 @@ public class Plan extends BukkitPlugin<Plan> implements IPlan {
}
}).runTaskTimerAsynchronously(analysisPeriod, analysisPeriod);
}
Benchmark.stop("Enable", "Task Registration");
}
@ -330,14 +330,6 @@ public class Plan extends BukkitPlugin<Plan> implements IPlan {
db.init();
}
/**
* Setups the command console output filter
*/
private void setupFilter() {
org.apache.logging.log4j.core.Logger logger = (org.apache.logging.log4j.core.Logger) LogManager.getRootLogger();
logger.addFilter(new RegisterCommandFilter());
}
/**
* Used to access Cache.
*

7
Plan/src/main/java/com/djrapitops/plan/ServerVariableHolder.java
View File

@ -1,5 +1,8 @@
package main.java.com.djrapitops.plan;
import net.md_5.bungee.api.ProxyServer;
import org.bukkit.Server;
/**
* Class responsible for holding server variable values that do not change
* without a reload.
@ -22,7 +25,7 @@ public class ServerVariableHolder {
*
* @param server instance the plugin is running on.
*/
public ServerVariableHolder(org.bukkit.Server server) {
public ServerVariableHolder(Server server) {
ip = server.getIp();
name = server.getName();
port = server.getPort();
@ -40,7 +43,7 @@ public class ServerVariableHolder {
*
* @param server instance the plugin is running on.
*/
public ServerVariableHolder(net.md_5.bungee.api.ProxyServer server) {
public ServerVariableHolder(ProxyServer server) {
ip = Settings.BUNGEE_IP.toString();
name = "BungeeCord";
port = -1;

1
Plan/src/main/java/com/djrapitops/plan/api/exceptions/DatabaseInitException.java
View File

@ -10,6 +10,7 @@ package main.java.com.djrapitops.plan.api.exceptions;
* @author Rsl1122
*/
public class DatabaseInitException extends DatabaseException {
public DatabaseInitException(String message, Throwable cause) {
super(message, cause);
}

1
Plan/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.java
View File

@ -10,6 +10,7 @@ package main.java.com.djrapitops.plan.api.exceptions;
* @author Rsl1122
*/
public class ParseException extends Exception {
public ParseException(Throwable cause) {
super(cause);
}

1
Plan/src/main/java/com/djrapitops/plan/api/exceptions/PlanEnableException.java
View File

@ -10,6 +10,7 @@ package main.java.com.djrapitops.plan.api.exceptions;
* @author Rsl1122
*/
public class PlanEnableException extends Exception {
public PlanEnableException(String message, Throwable cause) {
super(message, cause);
}

5
Plan/src/main/java/com/djrapitops/plan/bungee/PlanBungee.java
View File

@ -42,14 +42,9 @@ public class PlanBungee extends BungeePlugin<PlanBungee> implements IPlan {
private ProcessingQueue processingQueue;
public PlanBungee() {
}
@Override
public void onEnable() {
try {
super.setInstance(this);
super.setDebugMode(Settings.DEBUG.toString());
super.getPluginLogger().setFolder(getDataFolder());

12
Plan/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java
View File

@ -14,6 +14,8 @@ import main.java.com.djrapitops.plan.locale.Locale;
import main.java.com.djrapitops.plan.locale.Msg;
import main.java.com.djrapitops.plan.utilities.Check;
import main.java.com.djrapitops.plan.utilities.PassEncryptUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Logger;
/**
* Command for registering web users.
@ -38,7 +40,7 @@ public class RegisterCommand extends SubCommand {
Locale.get(Msg.CMD_USG_WEB_REGISTER).toString(),
"<password> [name] [access lvl]");
this.plugin = plugin;
setupFilter();
}
@Override
@ -133,4 +135,12 @@ public class RegisterCommand extends SubCommand {
}
}).runTaskAsynchronously();
}
/**
* Setups the command console output filter
*/
private void setupFilter() {
Logger logger = (Logger) LogManager.getRootLogger();
logger.addFilter(new RegisterCommandFilter());
}
}