AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

only print some exceptions when in LogLevel >= DEBUG

Browse Source
This commit is contained in:
Bixilon 2020-09-04 14:03:34 +02:00
parent 480e5db1ab
commit 6a5862f6d0
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
View File

@ -23,6 +23,7 @@ import de.bixilon.minosoft.game.datatypes.objectLoader.recipes.Recipes;
import de.bixilon.minosoft.game.datatypes.objectLoader.versions.Version; import de.bixilon.minosoft.game.datatypes.objectLoader.versions.Version;
import de.bixilon.minosoft.game.datatypes.objectLoader.versions.Versions; import de.bixilon.minosoft.game.datatypes.objectLoader.versions.Versions;
import de.bixilon.minosoft.logging.Log; import de.bixilon.minosoft.logging.Log;
import de.bixilon.minosoft.logging.LogLevels;
import de.bixilon.minosoft.ping.ServerListPing; import de.bixilon.minosoft.ping.ServerListPing;
import de.bixilon.minosoft.protocol.modding.channels.DefaultPluginChannels; import de.bixilon.minosoft.protocol.modding.channels.DefaultPluginChannels;
import de.bixilon.minosoft.protocol.modding.channels.PluginChannelHandler; import de.bixilon.minosoft.protocol.modding.channels.PluginChannelHandler;
@ -217,7 +218,9 @@ public class Connection {
try { try {
Versions.loadVersionMappings(version.getProtocolVersion()); Versions.loadVersionMappings(version.getProtocolVersion());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); if (Log.getLevel().ordinal() >= LogLevels.DEBUG.ordinal()) {
e.printStackTrace();
}
Log.fatal(String.format("Could not load mapping for %s. This version seems to be unsupported!", version)); Log.fatal(String.format("Could not load mapping for %s. This version seems to be unsupported!", version));
network.lastException = new RuntimeException(String.format("Mappings could not be loaded: %s", e.getLocalizedMessage())); network.lastException = new RuntimeException(String.format("Mappings could not be loaded: %s", e.getLocalizedMessage()));
setConnectionState(ConnectionStates.FAILED_NO_RETRY); setConnectionState(ConnectionStates.FAILED_NO_RETRY);
@ -267,7 +270,9 @@ public class Connection {
packet.log(); packet.log();
packet.handle(getHandler()); packet.handle(getHandler());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); if (Log.getLevel().ordinal() >= LogLevels.DEBUG.ordinal()) {
e.printStackTrace();
}
} }
} }
}); });

9
src/main/java/de/bixilon/minosoft/protocol/network/Network.java
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.protocol.network; package de.bixilon.minosoft.protocol.network;
import de.bixilon.minosoft.logging.Log; import de.bixilon.minosoft.logging.Log;
import de.bixilon.minosoft.logging.LogLevels;
import de.bixilon.minosoft.protocol.packets.ClientboundPacket; import de.bixilon.minosoft.protocol.packets.ClientboundPacket;
import de.bixilon.minosoft.protocol.packets.ServerboundPacket; import de.bixilon.minosoft.protocol.packets.ServerboundPacket;
import de.bixilon.minosoft.protocol.packets.clientbound.interfaces.PacketCompressionInterface; import de.bixilon.minosoft.protocol.packets.clientbound.interfaces.PacketCompressionInterface;
@ -227,7 +228,9 @@ public class Network {
} }
} catch (Exception e) { } catch (Exception e) {
Log.protocol(String.format("An error occurred while parsing an packet (%s): %s", packet, e)); Log.protocol(String.format("An error occurred while parsing an packet (%s): %s", packet, e));
e.printStackTrace(); if (Log.getLevel().ordinal() >= LogLevels.DEBUG.ordinal()) {
e.printStackTrace();
}
} }
} }
disconnect(); disconnect();
@ -238,7 +241,9 @@ public class Network {
if (socketSThread != null) { if (socketSThread != null) {
socketSThread.interrupt(); socketSThread.interrupt();
} }
e.printStackTrace(); if (Log.getLevel().ordinal() >= LogLevels.DEBUG.ordinal()) {
e.printStackTrace();
}
} }
}); });
socketRThread.setName(String.format("%d/Socket", connection.getConnectionId())); socketRThread.setName(String.format("%d/Socket", connection.getConnectionId()));

6
src/main/java/de/bixilon/minosoft/util/HTTP.java
View File

@ -14,6 +14,8 @@
package de.bixilon.minosoft.util; package de.bixilon.minosoft.util;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import de.bixilon.minosoft.logging.Log;
import de.bixilon.minosoft.logging.LogLevels;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
@ -33,7 +35,9 @@ public final class HTTP {
try { try {
return client.send(request, HttpResponse.BodyHandlers.ofString()); return client.send(request, HttpResponse.BodyHandlers.ofString());
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {
e.printStackTrace(); if (Log.getLevel().ordinal() >= LogLevels.DEBUG.ordinal()) {
e.printStackTrace();
}
} }
return null; return null;
} }

5
src/main/java/de/bixilon/minosoft/util/mojang/api/MojangStatus.java
View File

@ -18,6 +18,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import de.bixilon.minosoft.logging.Log; import de.bixilon.minosoft.logging.Log;
import de.bixilon.minosoft.logging.LogLevels;
import de.bixilon.minosoft.util.HTTP; import de.bixilon.minosoft.util.HTTP;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
@ -52,7 +53,9 @@ public final class MojangStatus {
return ret; return ret;
} catch (NullPointerException | JsonParseException e) { } catch (NullPointerException | JsonParseException e) {
e.printStackTrace(); if (Log.getLevel().ordinal() >= LogLevels.DEBUG.ordinal()) {
e.printStackTrace();
}
return getUnknownStatusMap(); return getUnknownStatusMap();
} }
} }