Only show error messages from SocketReader

Use query.isConnected() Fix NullPointer
Kakifrucht · Apr 18, 2017 · ea0fd75 · ea0fd75
1 parent 8574591
commit ea0fd75
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Halfminer Bot
 Teamspeak 3 Bot for Minecraft Server [Two and a half Miner](https://halfminer.de).
-Connecting to query via [API](https://github.com/TheHolyWaffle/TeamSpeak-3-Java-API).
+Connecting to query via [this API](https://github.com/TheHolyWaffle/TeamSpeak-3-Java-API).
 
 Current features
 -------
@@ -22,7 +22,7 @@ Current features
     - Server join message can be disabled
   - Command flood protection (optional bypass permission)
     - Custom cooldowns available additionally, for example for *!channel update*
-  - Default command if none supplied is !channel, to make channel creation easier
+  - Default command if none supplied is *!channel create*, to make channel creation easier
   - Permission to use command necessary
 - **Commands**
   - !admin

diff --git a/src/main/java/de/halfminer/hmbot/HalfminerBot.java b/src/main/java/de/halfminer/hmbot/HalfminerBot.java
@@ -122,7 +122,9 @@ public void onConnect(TS3Query ts3Query) {
             @Override
             public void onDisconnect(TS3Query ts3Query) {
                 logger.warn("Bot lost connection to server, trying to reconnect...");
-                scheduler.shutdown();
+                if(scheduler != null) {
+                    scheduler.shutdown();
+                }
             }
         });
 
@@ -206,12 +208,8 @@ public void stop(String message, boolean restart) {
 
         if (scheduler != null) scheduler.shutdown();
         if (storage != null) storage.doSaveOnDisk();
-        if (query != null) {
-            try {
-                query.exit();
-            } catch (NullPointerException ignored) {
-                // if exiting from query without successful connect NullPointerEx is thrown, we cannot check beforehand
-            }
+        if (query != null && query.isConnected()) {
+            query.exit();
         }
 
         synchronized (monitor) {

diff --git a/src/main/java/de/halfminer/hmbot/cmd/CmdRank.java b/src/main/java/de/halfminer/hmbot/cmd/CmdRank.java
@@ -60,7 +60,7 @@ void run() throws InvalidCommandException {
                     Gson gson = new Gson();
 
                     Type type = new TypeToken<Map<String, String>>(){}.getType();
-                    Map<String, String> GETMap = new Gson().fromJson(response.body().string(), type);
+                    Map<String, String> GETMap = gson.fromJson(response.body().string(), type);
                     String rank = GETMap.get("rank");
                     String uuid = GETMap.get("uuid");
                     String ip = GETMap.get("ip");

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
@@ -13,9 +13,13 @@
         </Async>
     </Appenders>
     <Loggers>
-        <Root level="debug">
-            <AppenderRef ref="consoleAppender" level="debug"/>
-            <AppenderRef ref="asyncFileAppender" level="info"/>
+        <Logger name="com.github.theholywaffle.teamspeak3.SocketReader" level="debug" additivity="false">
+            <AppenderRef ref="consoleAppender" level="error"/>
+            <AppenderRef ref="asyncFileAppender" level="error"/>
+        </Logger>
+        <Root level="info">
+            <AppenderRef ref="consoleAppender"/>
+            <AppenderRef ref="asyncFileAppender"/>
         </Root>
     </Loggers>
 </Configuration>