Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1874 Introduce individual ConsoleLogger instance per class (#1875)

Browse Source 
* #1874 Introduce individual ConsoleLogger instance per class
- Create ConsoleLoggerFactory from which a separate logger can be created for each class
- Allows to support individual log level settings in the future

* Fix CodeStyle issue

* Replace full class name with import

* Update usages after merge from master
This commit is contained in:
ljacqu
2019-08-06 15:15:16 +02:00
committed by Gabriele C
parent 254d4d75a2
commit c34f00f759
98 changed files with 853 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/task/purge/PurgeExecutor.java
+11 -8
View File
@@ -2,6 +2,7 @@ package fr.xephi.authme.task.purge;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.output.ConsoleLoggerFactory;
import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.service.PluginHookService;
@@ -21,6 +22,8 @@ import static fr.xephi.authme.util.FileUtils.makePath;
* Executes the purge operations.
*/
public class PurgeExecutor {
private final ConsoleLogger logger = ConsoleLoggerFactory.get(PurgeExecutor.class);
@Inject
private Settings settings;
@@ -85,7 +88,7 @@ public class PurgeExecutor {
}
}
ConsoleLogger.info("AutoPurge: Removed " + i + " AntiXRayData Files");
logger.info("AutoPurge: Removed " + i + " AntiXRayData Files");
}
/**
@@ -96,7 +99,7 @@ public class PurgeExecutor {
synchronized void purgeFromAuthMe(Collection<String> names) {
dataSource.purgeRecords(names);
//TODO ljacqu 20160717: We shouldn't output namedBanned.size() but the actual total that was deleted
ConsoleLogger.info(ChatColor.GOLD + "Deleted " + names.size() + " user accounts");
logger.info(ChatColor.GOLD + "Deleted " + names.size() + " user accounts");
}
/**
@@ -141,7 +144,7 @@ public class PurgeExecutor {
}
}
}
ConsoleLogger.info("AutoPurge: Removed " + i + " LimitedCreative Survival, Creative and Adventure files");
logger.info("AutoPurge: Removed " + i + " LimitedCreative Survival, Creative and Adventure files");
}
/**
@@ -165,7 +168,7 @@ public class PurgeExecutor {
}
}
ConsoleLogger.info("AutoPurge: Removed " + i + " .dat Files");
logger.info("AutoPurge: Removed " + i + " .dat Files");
}
/**
@@ -180,7 +183,7 @@ public class PurgeExecutor {
File essentialsDataFolder = pluginHookService.getEssentialsDataFolder();
if (essentialsDataFolder == null) {
ConsoleLogger.info("Cannot purge Essentials: plugin is not loaded");
logger.info("Cannot purge Essentials: plugin is not loaded");
return;
}
@@ -197,7 +200,7 @@ public class PurgeExecutor {
}
}
ConsoleLogger.info("AutoPurge: Removed " + deletedFiles + " EssentialsFiles");
logger.info("AutoPurge: Removed " + deletedFiles + " EssentialsFiles");
}
/**
@@ -212,12 +215,12 @@ public class PurgeExecutor {
for (OfflinePlayer offlinePlayer : cleared) {
if (!permissionsManager.loadUserData(offlinePlayer)) {
ConsoleLogger.warning("Unable to purge the permissions of user " + offlinePlayer + "!");
logger.warning("Unable to purge the permissions of user " + offlinePlayer + "!");
continue;
}
permissionsManager.removeAllGroups(offlinePlayer);
}
ConsoleLogger.info("AutoPurge: Removed permissions from " + cleared.size() + " player(s).");
logger.info("AutoPurge: Removed permissions from " + cleared.size() + " player(s).");
}
}
src/main/java/fr/xephi/authme/task/purge/PurgeService.java
+5 -2
View File
@@ -2,6 +2,7 @@ package fr.xephi.authme.task.purge;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.output.ConsoleLoggerFactory;
import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.settings.Settings;
@@ -21,6 +22,8 @@ import static fr.xephi.authme.util.Utils.logAndSendMessage;
* Initiates purge tasks.
*/
public class PurgeService {
private final ConsoleLogger logger = ConsoleLoggerFactory.get(PurgeService.class);
@Inject
private BukkitService bukkitService;
@@ -51,11 +54,11 @@ public class PurgeService {
if (!settings.getProperty(PurgeSettings.USE_AUTO_PURGE)) {
return;
} else if (daysBeforePurge <= 0) {
ConsoleLogger.warning("Did not run auto purge: configured days before purging must be positive");
logger.warning("Did not run auto purge: configured days before purging must be positive");
return;
}
ConsoleLogger.info("Automatically purging the database...");
logger.info("Automatically purging the database...");
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -daysBeforePurge);
long until = calendar.getTimeInMillis();
src/main/java/fr/xephi/authme/task/purge/PurgeTask.java
+5 -3
View File
@@ -1,6 +1,7 @@
package fr.xephi.authme.task.purge;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.output.ConsoleLoggerFactory;
import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.permission.PlayerStatePermission;
import org.bukkit.Bukkit;
@@ -19,6 +20,7 @@ class PurgeTask extends BukkitRunnable {
//how many players we should check for each tick
private static final int INTERVAL_CHECK = 5;
private final ConsoleLogger logger = ConsoleLoggerFactory.get(PurgeTask.class);
private final PurgeService purgeService;
private final PermissionsManager permissionsManager;
private final UUID sender;
@@ -74,7 +76,7 @@ class PurgeTask extends BukkitRunnable {
OfflinePlayer offlinePlayer = offlinePlayers[nextPosition];
if (offlinePlayer.getName() != null && toPurge.remove(offlinePlayer.getName().toLowerCase())) {
if (!permissionsManager.loadUserData(offlinePlayer)) {
ConsoleLogger.warning("Unable to check if the user " + offlinePlayer.getName() + " can be purged!");
logger.warning("Unable to check if the user " + offlinePlayer.getName() + " can be purged!");
continue;
}
if (!permissionsManager.hasPermissionOffline(offlinePlayer, PlayerStatePermission.BYPASS_PURGE)) {
@@ -85,7 +87,7 @@ class PurgeTask extends BukkitRunnable {
}
if (!toPurge.isEmpty() && playerPortion.isEmpty()) {
ConsoleLogger.info("Finished lookup of offlinePlayers. Begin looking purging player names only");
logger.info("Finished lookup of offlinePlayers. Begin looking purging player names only");
//we went through all offlineplayers but there are still names remaining
for (String name : toPurge) {
@@ -110,7 +112,7 @@ class PurgeTask extends BukkitRunnable {
// Show a status message
sendMessage(ChatColor.GREEN + "[AuthMe] Database has been purged successfully");
ConsoleLogger.info("Purge finished!");
logger.info("Purge finished!");
purgeService.setPurging(false);
}