Add config option for logging console/RCON commands

Author: imeesa

Essentials/src/main/java/com/earth2me/essentials/Essentials.java

@@ -747,7 +747,9 @@ public boolean onCommandEssentials(final CommandSender cSender, final Command co
                     LOGGER.log(Level.INFO, "CommandBlock at " + bSenderBlock.getX() + "," + bSenderBlock.getY() + "," + bSenderBlock.getZ() + " issued server command: /" + commandLabel + " " + EssentialsCommand.getFinalArg(args, 0));
                 }
             } else if (user == null) {
-                LOGGER.log(Level.INFO, cSender.getName()+ " issued server command: /" + commandLabel + " " + EssentialsCommand.getFinalArg(args, 0));
+                if (getSettings().logConsoleRconCommands()) {
+                    LOGGER.log(Level.INFO, cSender.getName()+ " issued server command: /" + commandLabel + " " + EssentialsCommand.getFinalArg(args, 0));
+                }
             }
 
             final CommandSource sender = new CommandSource(this, cSender);

Essentials/src/main/java/com/earth2me/essentials/ISettings.java

@@ -414,6 +414,8 @@ public interface ISettings extends IConf {
 
     boolean logCommandBlockCommands();
 
+    boolean logConsoleRconCommands();
+
     Set<Predicate<String>> getNickBlacklist();
 
     double getMaxProjectileSpeed();

Essentials/src/main/java/com/earth2me/essentials/Settings.java

@@ -146,6 +146,7 @@ public class Settings implements net.ess3.api.ISettings {
     private boolean isWaterSafe;
     private boolean isSafeUsermap;
     private boolean logCommandBlockCommands;
+    private boolean logConsoleRconCommands;
     private Set<Predicate<String>> nickBlacklist;
     private double maxProjectileSpeed;
     private boolean removeEffectsOnHeal;
@@ -930,6 +931,7 @@ public void reloadConfig() {
         isWaterSafe = _isWaterSafe();
         isSafeUsermap = _isSafeUsermap();
         logCommandBlockCommands = _logCommandBlockCommands();
+        logConsoleRconCommands = _logConsoleRconCommands();
         nickBlacklist = _getNickBlacklist();
         maxProjectileSpeed = _getMaxProjectileSpeed();
         removeEffectsOnHeal = _isRemovingEffectsOnHeal();
@@ -2084,6 +2086,15 @@ public boolean logCommandBlockCommands() {
         return logCommandBlockCommands;
     }
 
+    private boolean _logConsoleRconCommands() {
+        return config.getBoolean("log-console-rcon-commands", true);
+    }
+
+    @Override
+    public boolean logConsoleRconCommands() {
+        return logConsoleRconCommands;
+    }
+
     private Set<Predicate<String>> _getNickBlacklist() {
         final Set<Predicate<String>> blacklist = new HashSet<>();
 

Essentials/src/main/resources/config.yml

@@ -769,6 +769,10 @@ safe-usermap-names: true
 # Example: CommandBlock at <x>,<y>,<z> issued server command: /<command>
 log-command-block-commands: true
 
+# Should Essentials output logs when the console or RCON executes a command?
+# Example: CONSOLE issued server command: /<command>
+log-console-rcon-commands: true
+
 # Set the maximum speed for projectiles spawned with /fireball.
 max-projectile-speed: 8