From 879fdecd67a5e9f582033fc796e66b225aa49dc0 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 19 Jul 2020 01:12:10 -0400 Subject: [PATCH] so suddenly ServerTest is less reliable? --- java_console/io/src/main/java/com/rusefi/io/LinkManager.java | 2 +- .../src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java | 2 +- java_console/ui/src/test/java/com/rusefi/TestHelper.java | 4 ++-- .../proxy_server/src/main/java/com/rusefi/server/Backend.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java index 5760283579..c0967491f8 100644 --- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java @@ -208,7 +208,7 @@ public class LinkManager implements Closeable { int portPart = TcpConnector.getTcpPort(port); String hostname = TcpConnector.getHostname(port); socket = new Socket(hostname, portPart); - TcpIoStream tcpIoStream = new TcpIoStream(logger, socket); + TcpIoStream tcpIoStream = new TcpIoStream("[start] ", logger, socket); return tcpIoStream; } catch (Throwable e) { diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java index dcb3874fa3..7a4230506a 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java @@ -23,7 +23,7 @@ public class BinaryProtocolProxy { @Override public void run() { try { - TcpIoStream clientStream = new TcpIoStream(logger, clientSocket); + TcpIoStream clientStream = new TcpIoStream("[[proxy]] ", logger, clientSocket); runProxy(targetEcuSocket, clientStream); } catch (IOException e) { e.printStackTrace(); diff --git a/java_console/ui/src/test/java/com/rusefi/TestHelper.java b/java_console/ui/src/test/java/com/rusefi/TestHelper.java index 9ebb9fe4fc..5540599ffc 100644 --- a/java_console/ui/src/test/java/com/rusefi/TestHelper.java +++ b/java_console/ui/src/test/java/com/rusefi/TestHelper.java @@ -50,7 +50,7 @@ public class TestHelper { public static IoStream secureConnectToLocalhost(int controllerPort, Logger logger) { IoStream targetEcuSocket; try { - targetEcuSocket = new TcpIoStream(logger, rusEFISSLContext.getSSLSocket(ProxyClient.LOCALHOST, controllerPort)); + targetEcuSocket = new TcpIoStream("[local]", logger, rusEFISSLContext.getSSLSocket(ProxyClient.LOCALHOST, controllerPort)); } catch (IOException e) { throw new IllegalStateException("Failed to connect to controller " + ProxyClient.LOCALHOST + ":" + controllerPort); } @@ -61,7 +61,7 @@ public class TestHelper { public static IoStream connectToLocalhost(int controllerPort, Logger logger) { IoStream targetEcuSocket; try { - targetEcuSocket = new TcpIoStream(logger, new Socket(ProxyClient.LOCALHOST, controllerPort)); + targetEcuSocket = new TcpIoStream("[local]", logger, new Socket(ProxyClient.LOCALHOST, controllerPort)); } catch (IOException e) { throw new IllegalStateException("Failed to connect to controller " + ProxyClient.LOCALHOST + ":" + controllerPort); } diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java b/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java index d74c043b01..2ddd3cb1e2 100644 --- a/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java +++ b/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java @@ -133,7 +133,7 @@ public class Backend implements Closeable { if (applicationClientStream != null) applicationClientStream.close(); e.printStackTrace(); - logger.error("Got error " + e); + logger.info("Got error " + e); onDisconnectApplication(); } }