X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=251e75a99a9cdb10d1b282a90cd4c9940a326aef;hb=refs%2Ftags%2Fnikiroo-utils-3.1.2;hp=786d018ae00eaf38ee1ab55160ca05f0628c2003;hpb=8537d55a7dacf9f528ea9453b03d2391ea348846;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 786d018..251e75a 100644
--- a/src/be/nikiroo/utils/serial/server/ServerBridge.java
+++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java
@@ -1,8 +1,10 @@
package be.nikiroo.utils.serial.server;
import java.io.IOException;
+import java.lang.reflect.Array;
import java.net.Socket;
+import be.nikiroo.utils.StringUtils;
import be.nikiroo.utils.TraceHandler;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.Importer;
@@ -33,7 +35,13 @@ public class ServerBridge extends Server {
* found (which can later on be queried via
* {@link ServerBridge#getPort()}
* @param ssl
- * use a SSL connection (or not)
+ * use an SSL connection (or not)
+ * @param forwardToHost
+ * the host server to forward the calls to
+ * @param forwardToPort
+ * the host port to forward the calls to
+ * @param forwardToSsl
+ * use an SSL connection for the forward server or not
*
* @throws IOException
* in case of I/O error
@@ -55,7 +63,13 @@ public class ServerBridge extends Server {
* @param port
* the port to listen on
* @param ssl
- * use a SSL connection (or not)
+ * use an SSL connection (or not)
+ * @param forwardToHost
+ * the host server to forward the calls to
+ * @param forwardToPort
+ * the host port to forward the calls to
+ * @param forwardToSsl
+ * use an SSL connection for the forward server or not
*
* @throws IOException
* in case of I/O error
@@ -72,13 +86,15 @@ public class ServerBridge extends Server {
/**
* The traces handler for this {@link Server}.
*
+ * The trace levels are handled as follow:
*
- * - At level 1, it will only print basic IN/OUT messages with length.
- * - At level 2, it will also print the data as a String.
- * - At level 3, it will try to interpret it (SLOW) and print the object
- * type if possible.
- * - At level 4, it will try to print the {@link Object#toString()} value.
- *
+ * - 1: it will only print basic IN/OUT messages with length
+ * - 2: it will try to interpret it as an object (SLOW) and print the
+ * object class if possible
+ * - 3: it will try to print the {@link Object#toString()} value, or the
+ * data if it is not an object
+ * - 4: it will also print the unzipped serialised value if it is an
+ * object
*
*
* @param tracer
@@ -122,11 +138,9 @@ public class ServerBridge extends Server {
*
* @param clientVersion
* the client version
- * @param data
- * the data sent by the client
*/
protected void onClientContact(Version clientVersion) {
- getTraceHandler().trace("CLIENT " + clientVersion);
+ getTraceHandler().trace("<<< CLIENT " + clientVersion);
}
/**
@@ -134,11 +148,10 @@ public class ServerBridge extends Server {
*
* @param serverVersion
* the server version
- * @param data
- * the data sent by the client
*/
protected void onServerContact(Version serverVersion) {
- getTraceHandler().trace("SERVER " + serverVersion);
+ getTraceHandler().trace(">>> SERVER " + serverVersion);
+ getTraceHandler().trace("");
}
/**
@@ -175,25 +188,67 @@ public class ServerBridge extends Server {
* the data to trace
*/
private void trace(String prefix, String data) {
- getTraceHandler().trace(prefix + ": " + data.length() + " characters",
- 1);
+ int size = data.length();
+ String ssize = size + " byte";
+ if (size > 1) {
+ ssize = size + " bytes";
+ if (size >= 1000) {
+ size = size / 1000;
+ ssize = size + " kb";
+ if (size > 1000) {
+ size = size / 1000;
+ ssize = size + " MB";
+ }
+ }
+ }
+
+ getTraceHandler().trace(prefix + ": " + ssize, 1);
if (getTraceHandler().getTraceLevel() >= 2) {
try {
+ if (data.startsWith("ZIP:")) {
+ data = StringUtils.unzip64(data.substring(4));
+ }
+
Object obj = new Importer().read(data).getValue();
if (obj == null) {
+ getTraceHandler().trace("NULL", 2);
getTraceHandler().trace("NULL", 3);
getTraceHandler().trace("NULL", 4);
} else {
- getTraceHandler().trace("(" + obj.getClass() + ")", 3);
- getTraceHandler().trace("" + obj.toString(), 4);
+ if (obj.getClass().isArray()) {
+ getTraceHandler().trace(
+ "(" + obj.getClass() + ") with "
+ + Array.getLength(obj) + "element(s)",
+ 3);
+ } else {
+ getTraceHandler().trace("(" + obj.getClass() + ")", 2);
+ }
+ getTraceHandler().trace("" + obj.toString(), 3);
+ getTraceHandler().trace(data, 4);
}
+ } catch (NoSuchMethodException e) {
+ getTraceHandler().trace("(not an object)", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
+ } catch (NoSuchFieldException e) {
+ getTraceHandler().trace(
+ "(incompatible: " + e.getMessage() + ")", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
+ } catch (ClassNotFoundException e) {
+ getTraceHandler().trace(
+ "(unknown object: " + e.getMessage() + ")", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
} catch (Exception e) {
- getTraceHandler().trace("(not an object)", 3);
- getTraceHandler().trace(data, 4);
+ getTraceHandler().trace(
+ "(decode error: " + e.getMessage() + ")", 2);
+ getTraceHandler().trace(data, 3);
+ getTraceHandler().trace("", 4);
}
- getTraceHandler().trace("", 4);
+ getTraceHandler().trace("", 2);
}
}
@@ -205,11 +260,12 @@ public class ServerBridge extends Server {
*
* - The bridge name
* - The bridge port
- * - TRUE for a ssl bridge, FALSE for plain text
+ * - TRUE for an SSL bridge, FALSE for plain text
* - The forward server host
* - The forward server port
- * - TRUE for a ssl forward server, FALSE for plain text
+ * - TRUE for an SSL forward server, FALSE for plain text
* - (optional) a trace level
+ * - (optional) a truncate size for data
*
*/
public static void main(String[] args) {
@@ -217,14 +273,15 @@ public class ServerBridge extends Server {
try {
if (args.length < 6) {
tracer.error("Invalid syntax.\n"
- + "Syntax: [name] [port] [ssl] [fhost] [fport] [fssl] ([trace level])\n"
+ + "Syntax: [name] [port] [ssl] [fhost] [fport] [fssl] ([trace level]) ([max])\n"
+ "\tname: the bridge name\n"
+ "\tport: the bridge port\n"
+ "\tssl: TRUE for an SSL bridge, FALSE for plain text\n"
+ "\tfhost: the forward server host\n"
+ "\tfport: the forward server port\n"
+ "\tfssl: TRUE for an SSL forward server, FALSE for plain text\n"
- + "\ttrace level: the optional trace level (default is 1)\n");
+ + "\ttrace level: the optional trace level (default is 1)\n"
+ + "\tmax: the maximum size after which to truncate data\n");
return;
}
@@ -240,10 +297,15 @@ public class ServerBridge extends Server {
if (args.length > 6) {
traceLevel = Integer.parseInt(args[i++]);
}
+ int maxPrintSize = 1;
+ if (args.length > 7) {
+ maxPrintSize = Integer.parseInt(args[i++]);
+ }
ServerBridge bridge = new ServerBridge(name, port, ssl, fhost,
fport, fssl);
- bridge.setTraceHandler(new TraceHandler(true, true, traceLevel));
+ bridge.setTraceHandler(new TraceHandler(true, true, traceLevel,
+ maxPrintSize));
bridge.run();
} catch (Exception e) {
tracer.error(e);