From e1bfe6acfc775775f2470a30a20fdf2445c81bcb Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Mon, 5 Oct 2020 23:41:16 -0400
Subject: [PATCH] better logging in proxy

---
 .../com/rusefi/binaryprotocol/IncomingDataBuffer.java     | 2 +-
 .../src/main/java/com/rusefi/server/Backend.java          | 1 +
 .../java/com/rusefi/server/ControllerConnectionState.java | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
index 3630e21ffd..3faabb7339 100644
--- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
+++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
@@ -83,7 +83,7 @@ public class IncomingDataBuffer {
         boolean isCrcOk = actualCrc == packetCrc;
         if (!isCrcOk) {
             if (log.debugEnabled())
-                log.debug(String.format("%x", actualCrc) + " vs " + String.format("%x", packetCrc));
+                log.debug(String.format("CRC mismatch %x: vs %x", actualCrc, packetCrc));
             return null;
         }
         onPacketArrived();
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 e75d5115a0..e0bec88c7a 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
@@ -250,6 +250,7 @@ public class Backend implements Closeable {
         this.serverPortForControllers = serverPortForControllers;
         log.info("Starting controller connector at " + serverPortForControllers);
         controllerConnector = BinaryProtocolServer.tcpServerSocket(controllerSocket -> () -> {
+            log.info("New connection from " + controllerSocket.getRemoteSocketAddress());
             totalSessions.incrementAndGet();
             ControllerConnectionState controllerConnectionState = new ControllerConnectionState(controllerSocket, getUserDetailsResolver());
             try {
diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java b/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
index 03fd760e4e..924f219173 100644
--- a/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
+++ b/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
@@ -94,11 +94,13 @@ public class ControllerConnectionState {
     public void requestControllerInfo() throws IOException {
         HelloCommand.send(stream);
         String jsonString = HelloCommand.getHelloResponse(incomingData);
-        if (jsonString == null)
-            return;
+        if (jsonString == null) {
+            throw new IOException("Invalid HELLO response");
+        }
         sessionDetails = SessionDetails.valueOf(jsonString);
-        if (!AuthTokenUtil.isToken(sessionDetails.getAuthToken()))
+        if (!AuthTokenUtil.isToken(sessionDetails.getAuthToken())) {
             throw new IOException("Invalid token in " + jsonString);
+        }
 
         log.info(sessionDetails.getAuthToken() + " New client: " + sessionDetails.getControllerInfo());
         userDetails = userDetailsResolver.apply(sessionDetails.getAuthToken());