X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=4aa9c41fab5b7cbf9bd934008b4002f5fc366f75;hb=451f434bd60a354ae5928f5da36b76f24b7b423b;hp=b72c98ddd44fe45dcc0b8cb99f97565b4240e6b7;hpb=452f38c8b9e98215f4ed6def6f3f8fd5dfa75daa;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java index b72c98d..4aa9c41 100644 --- a/src/be/nikiroo/utils/serial/server/ServerBridge.java +++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java @@ -127,6 +127,14 @@ public class ServerBridge extends Server { onSend(serverVersion, fromServer); bridge.send(fromServer); } + + getTraceHandler().trace("=== DONE", 1); + getTraceHandler().trace("", 1); + } + + @Override + protected void onError(Exception e) { + ServerBridge.this.onError(e); } }.connect(); } @@ -140,7 +148,7 @@ public class ServerBridge extends Server { * the client version */ protected void onClientContact(Version clientVersion) { - getTraceHandler().trace("<<< CLIENT " + clientVersion); + getTraceHandler().trace(">>> CLIENT " + clientVersion); } /** @@ -150,7 +158,8 @@ public class ServerBridge extends Server { * the server version */ protected void onServerContact(Version serverVersion) { - getTraceHandler().trace(">>> SERVER " + serverVersion); + getTraceHandler().trace("<<< SERVER " + serverVersion); + getTraceHandler().trace(""); } /** @@ -162,7 +171,7 @@ public class ServerBridge extends Server { * the data sent by the client */ protected void onRec(Version clientVersion, String data) { - trace("<<< CLIENT (" + clientVersion + ")", data); + trace(">>> CLIENT (" + clientVersion + ")", data); } /** @@ -175,7 +184,7 @@ public class ServerBridge extends Server { * the data sent by the client */ protected void onSend(Version serverVersion, String data) { - trace(">>> SERVER (" + serverVersion + ")", data); + trace("<<< SERVER (" + serverVersion + ")", data); } /** @@ -232,8 +241,7 @@ public class ServerBridge extends Server { getTraceHandler().trace("", 4); } catch (NoSuchFieldException e) { getTraceHandler().trace( - "(object known but incompatible: " + e.getMessage() - + ")", 2); + "(incompatible: " + e.getMessage() + ")", 2); getTraceHandler().trace(data, 3); getTraceHandler().trace("", 4); } catch (ClassNotFoundException e) { @@ -242,9 +250,8 @@ public class ServerBridge extends Server { getTraceHandler().trace(data, 3); getTraceHandler().trace("", 4); } catch (Exception e) { - getTraceHandler() - .trace("(error when trying to decode: " - + e.getMessage() + ")", 2); + getTraceHandler().trace( + "(decode error: " + e.getMessage() + ")", 2); getTraceHandler().trace(data, 3); getTraceHandler().trace("", 4); } @@ -266,6 +273,7 @@ public class ServerBridge extends Server { *