Skip to content

Commit 2868c72

Browse files
committed
log prefix to any error traces
1 parent bc6cf31 commit 2868c72

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed

src/main/java/com/denizenscript/depenizen/bungee/DepenizenBungee.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,16 @@ else if (result.startsWith("/")) {
215215
}
216216
}
217217
catch (TimeoutException ex) {
218+
DepenizenBungee.instance.getLogger().info("Proxy ChatEvent TimeoutException");
218219
continue;
219220
}
220221
catch (ExecutionException ex) {
222+
DepenizenBungee.instance.getLogger().info("Proxy ChatEvent ExecutionException");
221223
ex.printStackTrace();
222224
return;
223225
}
224226
catch (InterruptedException ex) {
227+
DepenizenBungee.instance.getLogger().info("Proxy ChatEvent InterruptedException");
225228
ex.printStackTrace();
226229
return;
227230
}

src/main/java/com/denizenscript/depenizen/bungee/DepenizenConnection.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ public void build(Channel channel, InetAddress address) {
2424
while (channel.pipeline().firstContext() != null) {
2525
channel.pipeline().removeFirst();
2626
}
27-
channel.pipeline().addLast(this).addLast(new NettyExceptionHandler());
27+
NettyExceptionHandler handler = new NettyExceptionHandler();
28+
handler.connection = this;
29+
channel.pipeline().addLast(this).addLast(handler);
2830
for (DepenizenConnection server : DepenizenBungee.instance.getConnections()) {
2931
if (server.thisServer != null && server.thisServer.getName() != null) {
3032
sendPacket(new AddServerPacketOut(server.thisServer.getName()));
@@ -187,6 +189,7 @@ else if (currentStage == Stage.AWAIT_DATA) {
187189
reallocateBuf(ctx);
188190
}
189191
catch (Throwable ex) {
192+
DepenizenBungee.instance.getLogger().info("Connection " + connectionName + " received exception, failing");
190193
ex.printStackTrace();
191194
fail("Internal exception.");
192195
return;

src/main/java/com/denizenscript/depenizen/bungee/NettyExceptionHandler.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66

77
public class NettyExceptionHandler extends ChannelDuplexHandler {
88

9+
public DepenizenConnection connection;
10+
911
@Override
1012
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
13+
DepenizenBungee.instance.getLogger().info("Connection " + connection.connectionName + " caught an exception");
1114
cause.printStackTrace();
1215
}
1316

@@ -17,6 +20,7 @@ public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, Sock
1720
@Override
1821
public void operationComplete(ChannelFuture future) {
1922
if (!future.isSuccess()) {
23+
DepenizenBungee.instance.getLogger().info("Connection " + connection.connectionName + " failed to operationComplete");
2024
future.cause().printStackTrace();
2125
}
2226
}
@@ -29,6 +33,7 @@ public void close(ChannelHandlerContext ctx, ChannelPromise promise) {
2933
@Override
3034
public void operationComplete(ChannelFuture future) {
3135
if (!future.isSuccess()) {
36+
DepenizenBungee.instance.getLogger().info("Connection " + connection.connectionName + " failed to close");
3237
future.cause().printStackTrace();
3338
}
3439
}
@@ -41,6 +46,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
4146
@Override
4247
public void operationComplete(ChannelFuture future) {
4348
if (!future.isSuccess()) {
49+
DepenizenBungee.instance.getLogger().info("Connection " + connection.connectionName + " failed to write");
4450
future.cause().printStackTrace();
4551
}
4652
}

src/main/java/com/denizenscript/depenizen/bungee/ReflectionHelper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public static Field getField(Class<?> clazz, String field) {
1313
return f;
1414
}
1515
catch (Exception ex) {
16+
DepenizenBungee.instance.getLogger().info("ReflectionHelper.getField failed for " + field);
1617
ex.printStackTrace();
1718
}
1819
return null;
@@ -23,6 +24,7 @@ public static MethodHandle getGetter(Class<?> clazz, String name) {
2324
return LOOKUP.unreflectGetter(getField(clazz, name));
2425
}
2526
catch (Exception ex) {
27+
DepenizenBungee.instance.getLogger().info("ReflectionHelper.getGetter failed for " + name);
2628
ex.printStackTrace();
2729
}
2830
return null;
@@ -33,6 +35,7 @@ public static MethodHandle getSetter(Class<?> clazz, String name) {
3335
return LOOKUP.unreflectSetter(getField(clazz, name));
3436
}
3537
catch (Exception ex) {
38+
DepenizenBungee.instance.getLogger().info("ReflectionHelper.getSetter failed for " + name);
3639
ex.printStackTrace();
3740
}
3841
return null;

src/main/java/com/denizenscript/depenizen/bungee/packets/out/YourInfoPacketOut.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.denizenscript.depenizen.bungee.packets.out;
22

33
import com.denizenscript.depenizen.bungee.PacketOut;
4-
import com.google.common.base.Charsets;
54
import io.netty.buffer.ByteBuf;
65

76
public class YourInfoPacketOut extends PacketOut {

0 commit comments

Comments
 (0)