Skip to content

Commit 50d86c1

Browse files
committed
Use a proper logger
Eliminated all the system.out calls
1 parent ac7e306 commit 50d86c1

File tree

5 files changed

+38
-17
lines changed

5 files changed

+38
-17
lines changed

API/src/main/java/me/innectic/permissify/api/PermissifyAPI.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,14 @@
3333
import me.innectic.permissify.api.util.ChatModule;
3434
import me.innectic.permissify.api.util.DisplayUtil;
3535

36+
import java.awt.*;
3637
import java.lang.reflect.InvocationTargetException;
3738
import java.util.ArrayList;
3839
import java.util.Optional;
40+
import java.util.logging.Level;
41+
import java.util.logging.Logger;
42+
import java.util.logging.SimpleFormatter;
43+
import java.util.logging.StreamHandler;
3944

4045
/**
4146
* @author Innectic
@@ -48,12 +53,14 @@ public class PermissifyAPI {
4853
@Getter private Optional<DatabaseHandler> databaseHandler;
4954
@Getter private DisplayUtil displayUtil;
5055
@Getter private ProfileSerializer serializer;
56+
@Getter private Logger logger;
5157

5258
/**
5359
* Initialize Permissify's API
5460
*/
55-
public void initialize(HandlerType type, Optional<ConnectionInformation> connectionInformation, DisplayUtil displayUtil) throws Exception {
61+
public void initialize(HandlerType type, Optional<ConnectionInformation> connectionInformation, DisplayUtil displayUtil, Logger logger) throws Exception {
5662
instance = Optional.of(this);
63+
this.logger = logger;
5764
this.displayUtil = displayUtil;
5865
serializer = new ProfileSerializer();
5966

@@ -67,10 +74,10 @@ public void initialize(HandlerType type, Optional<ConnectionInformation> connect
6774
handler.initialize();
6875
handler.reload(new ArrayList<>());
6976
boolean connected = handler.connect();
70-
if (connected) System.out.println("Connected to the database.");
71-
else System.out.println("Unable to connect to the database.");
77+
if (connected) logger.info("Connected to the database.");
78+
else logger.log(Level.SEVERE, "Unable to connect to the database.");
7279
});
73-
System.out.println("Registering Permissify modules...");
80+
logger.info("Registering Permissify modules...");
7481
ModuleRegister.registerModule(ChatModule.class, "internal");
7582
}
7683

API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import java.sql.*;
4141
import java.util.*;
42+
import java.util.logging.Level;
4243
import java.util.stream.Collectors;
4344

4445
/**
@@ -323,7 +324,7 @@ public void loadProfile(PermissifyProfile profile) {
323324
createGroup(group.getName(), group.getPrefix(), group.getSuffix(), group.getChatColor());
324325
Optional<PermissionGroup> created = getGroup(group.getName());
325326
if (!created.isPresent()) {
326-
System.out.println("Profile group was never created?");
327+
PermissifyAPI.get().ifPresent(api -> api.getLogger().log(Level.WARNING, "Profile group was never created?"));
327328
return;
328329
}
329330
// Add permissions to the group

API/src/main/java/me/innectic/permissify/api/module/registry/ModuleRegister.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.innectic.permissify.api.module.registry;
22

33
import lombok.Getter;
4+
import me.innectic.permissify.api.PermissifyAPI;
45
import me.innectic.permissify.api.module.PermissifyModule;
56
import me.innectic.permissify.api.module.annotation.Handles;
67

@@ -10,6 +11,7 @@
1011
import java.util.Arrays;
1112
import java.util.HashMap;
1213
import java.util.Map;
14+
import java.util.logging.Level;
1315

1416
/**
1517
* @author Innectic
@@ -23,13 +25,15 @@ public class ModuleRegister {
2325

2426
public static void setChatHandler(Method chatHandler, String source) {
2527
if (!source.equals("internal"))
26-
System.out.printf("Permissify chat handler has been overriden by %s! Disable before reporting any bugs!\n", source);
28+
PermissifyAPI.get().ifPresent(api -> api.getLogger().log(Level.WARNING,
29+
String.format("Permissify chat handler has been overriden by %s! Disable before reporting any bugs!", source)));
2730
ModuleRegister.chatHandler = chatHandler;
2831
}
2932

3033
public static void setWhisperHandler(Method whisperHandler, String source) {
3134
if (!source.equals("internal"))
32-
System.out.printf("Permissify whisper handler has been overriden by %s! Disable before reporting any bugs!\n", source);
35+
PermissifyAPI.get().ifPresent(api -> api.getLogger().log(Level.WARNING,
36+
String.format("Permissify whisper handler has been overriden by %s! Disable before reporting any bugs!", source)));
3337
ModuleRegister.whisperHandler = whisperHandler;
3438
}
3539

@@ -45,7 +49,8 @@ public static void registerModule(Class<? extends PermissifyModule> module, Stri
4549
if (handleAnnotation.value().equals("chat")) ModuleRegister.setChatHandler(method, source);
4650
else if (handleAnnotation.value().equals("whisper")) ModuleRegister.setWhisperHandler(method, source);
4751
});
48-
System.out.println(String.format("Module %s has been registered!", constructedModule.getModuleName()));
52+
PermissifyAPI.get().ifPresent(api -> api.getLogger().log(Level.WARNING,
53+
String.format("Module %s has been registered!", constructedModule.getModuleName())));
4954
} catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
5055
// TODO: Permissify error reporting
5156
e.printStackTrace();

Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import me.innectic.permissify.spigot.utils.ConfigVerifier;
3737
import me.innectic.permissify.spigot.utils.DisplayUtil;
3838
import org.bukkit.Bukkit;
39+
import org.bukkit.ChatColor;
3940
import org.bukkit.plugin.PluginManager;
4041
import org.bukkit.plugin.java.JavaPlugin;
4142

@@ -62,6 +63,7 @@ public class PermissifyMain extends JavaPlugin {
6263

6364
@Override
6465
public void onEnable() {
66+
long start = System.currentTimeMillis();
6567
createConfig();
6668
// Verify the config
6769
configVerifier = new ConfigVerifier();
@@ -70,19 +72,22 @@ public void onEnable() {
7072
// Initialize the API
7173
permissifyAPI = new PermissifyAPI();
7274
if (!handler.isPresent() || !handler.get().getHandlerType().isPresent()) {
73-
System.out.println("Internal Permissify Error: No handler / type present!");
75+
getLogger().log(Level.SEVERE, ChatColor.RED + "Internal Permissify Error: No handler / type present!");
7476
return;
7577
}
7678
handleChat = getConfig().getBoolean("handleChat");
7779
try {
78-
permissifyAPI.initialize(handler.get().getHandlerType().get(), handler.get().getConnectionInformation(), new DisplayUtil());
80+
permissifyAPI.initialize(handler.get().getHandlerType().get(), handler.get().getConnectionInformation(), new DisplayUtil(), getLogger());
7981
} catch (Exception e) {
8082
e.printStackTrace();
8183
}
8284
// Register commands
8385
registerCommands();
8486
// Register listeners
8587
registerListeners();
88+
long timeTaken = System.currentTimeMillis() - start;
89+
90+
getLogger().info("Permissify initialized in " + ((double) timeTaken / 1000) + " seconds (" + timeTaken + " ms)!");
8691
}
8792

8893
@Override

Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/ProfileCommand.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.bukkit.command.CommandSender;
3535

3636
import java.util.Optional;
37+
import java.util.logging.Logger;
3738

3839
/**
3940
* @author Innectic
@@ -65,25 +66,26 @@ private CommandResponse handleLoadProfile(CommandSender sender, String[] args) {
6566
if (args.length < 1) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PROFILE_LOAD, false);
6667
if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())
6768
return new CommandResponse(PermissifyConstants.UNABLE_TO_SET.replace("<REASON>", "No database handler"), false);
69+
Logger logger = PermissifyMain.getInstance().getPermissifyAPI().getLogger();
6870

6971
boolean saved = saveProfile(args[0] + "-pre-load");
7072
if (!saved) return new CommandResponse(PermissifyConstants.PROFILE_NOT_SAVED.replace("<PROFILE>", args[0]), false);
7173

7274
DatabaseHandler handler = PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get();
7375

74-
System.out.println("Loading profile...");
76+
logger.info("Loading profile...");
7577
long originalStart = System.currentTimeMillis();
7678
String baseDir = PermissifyMain.getInstance().getDataFolder().getAbsolutePath();
7779
Optional<PermissifyProfile> profile = PermissifyMain.getInstance().getPermissifyAPI().getSerializer().deserialize(args[0], baseDir);
7880
long end = System.currentTimeMillis();
79-
System.out.println("Loaded profile in " + (end - originalStart) + " ms.");
81+
logger.info("Loaded profile in " + (end - originalStart) + " ms.");
8082
if (!profile.isPresent()) return new CommandResponse(PermissifyConstants.PROFILE_NOT_LOADED.replace("<PROFILE>", args[0]), false);
8183

8284
long start = System.currentTimeMillis();
8385
handler.drop();
8486
handler.loadProfile(profile.get());
8587
end = System.currentTimeMillis();
86-
System.out.println("Parsed profile in " + (end - start) + " ms.");
88+
logger.info("Parsed profile in " + (end - start) + " ms.");
8789

8890
return new CommandResponse(PermissifyConstants.PROFILE_LOADED.replace("<PROFILE>", args[0])
8991
.replace("<TIME>", Long.toString(end - originalStart)), true);
@@ -92,24 +94,25 @@ private CommandResponse handleLoadProfile(CommandSender sender, String[] args) {
9294
private boolean saveProfile(String name) {
9395
if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent()) return false;
9496
DatabaseHandler handler = PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get();
97+
Logger logger = PermissifyMain.getInstance().getPermissifyAPI().getLogger();
9598

9699
// Generate the profile
97-
System.out.println("Generating profile...");
100+
logger.info("Generating profile...");
98101
long start = System.currentTimeMillis();
99102
PermissifyProfile profile = new PermissifyProfile(handler.getGroups(), handler.getCachedPermissions(),
100103
handler.getDefaultGroup().isPresent() ? handler.getDefaultGroup().get() : null,
101104
handler.getChatFormat(false), handler.getWhisperFormat(false), handler.getSuperAdmins(),
102105
PermissifyConstants.PERMISSIFY_PROFILE_VERSION);
103106
long end = System.currentTimeMillis();
104-
System.out.println("Generated profile in " + (end - start) + " ms.");
107+
logger.info("Generated profile in " + (end - start) + " ms.");
105108

106109
// Save the profile to a file
107-
System.out.println("Saving profile...");
110+
logger.info("Saving profile...");
108111
start = System.currentTimeMillis();
109112
String baseDir = PermissifyMain.getInstance().getDataFolder().getAbsolutePath();
110113
boolean saved = PermissifyMain.getInstance().getPermissifyAPI().getSerializer().serialize(profile, baseDir, name);
111114
end = System.currentTimeMillis();
112-
System.out.println("Serialized profile in " + (end - start) + " ms.");
115+
logger.info("Serialized profile in " + (end - start) + " ms.");
113116
return saved;
114117
}
115118
}

0 commit comments

Comments
 (0)