andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better logging in proxy

This commit is contained in:
rusefillc 2020-10-05 23:41:16 -04:00
parent 85c93099b6
commit e1bfe6acfc
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
View File

@ -83,7 +83,7 @@ public class IncomingDataBuffer {
boolean isCrcOk = actualCrc == packetCrc; boolean isCrcOk = actualCrc == packetCrc;
if (!isCrcOk) { if (!isCrcOk) {
if (log.debugEnabled()) 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; return null;
} }
onPacketArrived(); onPacketArrived();

1
java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java
View File

@ -250,6 +250,7 @@ public class Backend implements Closeable {
this.serverPortForControllers = serverPortForControllers; this.serverPortForControllers = serverPortForControllers;
log.info("Starting controller connector at " + serverPortForControllers); log.info("Starting controller connector at " + serverPortForControllers);
controllerConnector = BinaryProtocolServer.tcpServerSocket(controllerSocket -> () -> { controllerConnector = BinaryProtocolServer.tcpServerSocket(controllerSocket -> () -> {
log.info("New connection from " + controllerSocket.getRemoteSocketAddress());
totalSessions.incrementAndGet(); totalSessions.incrementAndGet();
ControllerConnectionState controllerConnectionState = new ControllerConnectionState(controllerSocket, getUserDetailsResolver()); ControllerConnectionState controllerConnectionState = new ControllerConnectionState(controllerSocket, getUserDetailsResolver());
try { try {

8
java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
View File

@ -94,11 +94,13 @@ public class ControllerConnectionState {
public void requestControllerInfo() throws IOException { public void requestControllerInfo() throws IOException {
HelloCommand.send(stream); HelloCommand.send(stream);
String jsonString = HelloCommand.getHelloResponse(incomingData); String jsonString = HelloCommand.getHelloResponse(incomingData);
if (jsonString == null) if (jsonString == null) {
return; throw new IOException("Invalid HELLO response");
}
sessionDetails = SessionDetails.valueOf(jsonString); sessionDetails = SessionDetails.valueOf(jsonString);
if (!AuthTokenUtil.isToken(sessionDetails.getAuthToken())) if (!AuthTokenUtil.isToken(sessionDetails.getAuthToken())) {
throw new IOException("Invalid token in " + jsonString); throw new IOException("Invalid token in " + jsonString);
}
log.info(sessionDetails.getAuthToken() + " New client: " + sessionDetails.getControllerInfo()); log.info(sessionDetails.getAuthToken() + " New client: " + sessionDetails.getControllerInfo());
userDetails = userDetailsResolver.apply(sessionDetails.getAuthToken()); userDetails = userDetailsResolver.apply(sessionDetails.getAuthToken());