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

java logging migration

This commit is contained in:
rusefi 2020-07-25 19:39:53 -04:00
parent 98404eb69b
commit d225b6bd54
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/ui/src/main/java/com/rusefi/autodetect/PortDetector.java
View File

@ -36,7 +36,7 @@ public class PortDetector {
CountDownLatch portFound = new CountDownLatch(1);
AtomicReference<String> result = new AtomicReference<>();
for (String serialPort : serialPorts) {
Thread thread = AUTO_DETECT_PORT.newThread(new SerialAutoChecker(FileLog.LOGGER, serialPort, portFound, result, callback));
Thread thread = AUTO_DETECT_PORT.newThread(new SerialAutoChecker(serialPort, portFound, result, callback));
serialFinder.add(thread);
thread.start();
}

15
java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
View File

@ -1,7 +1,6 @@
package com.rusefi.autodetect;
import com.opensr5.Logger;
import com.rusefi.FileLog;
import com.devexperts.logging.Logging;
import com.rusefi.binaryprotocol.BinaryProtocolCommands;
import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.config.generated.Fields;
@ -17,29 +16,27 @@ import java.util.function.Function;
import static com.rusefi.binaryprotocol.IoHelper.checkResponseCode;
public class SerialAutoChecker implements Runnable {
private final Logger logger;
private final static Logging log = Logging.getLogging(SerialAutoChecker.class);
private final String serialPort;
private final CountDownLatch portFound;
private final AtomicReference<String> result;
private final Function<IoStream, Void> callback;
public static String SIGNATURE;
public SerialAutoChecker(Logger logger, String serialPort, CountDownLatch portFound, AtomicReference<String> result, Function<IoStream, Void> callback) {
this.logger = logger;
public SerialAutoChecker(String serialPort, CountDownLatch portFound, AtomicReference<String> result, Function<IoStream, Void> callback) {
this.serialPort = serialPort;
this.portFound = portFound;
this.result = result;
this.callback = callback;
}
public SerialAutoChecker(Logger logger, String serialPort, CountDownLatch portFound, AtomicReference<String> result) {
this(logger, serialPort, portFound, result, null);
public SerialAutoChecker(String serialPort, CountDownLatch portFound, AtomicReference<String> result) {
this(serialPort, portFound, result, null);
}
@Override
public void run() {
IoStream stream = SerialIoStreamJSerialComm.openPort(serialPort);
Logger logger = FileLog.LOGGER;
IncomingDataBuffer incomingData = stream.getDataBuffer();
try {
HelloCommand.send(stream);
@ -48,7 +45,7 @@ public class SerialAutoChecker implements Runnable {
return;
String signature = new String(response, 1, response.length - 1);
SIGNATURE = signature;
System.out.println("Got signature=" + signature + " from " + serialPort);
log.info("Got signature=" + signature + " from " + serialPort);
if (signature.startsWith(Fields.PROTOCOL_SIGNATURE_PREFIX)) {
if (callback != null) {
callback.apply(stream);

4
java_console/ui/src/main/java/com/rusefi/tools/NetworkConnectorStartup.java
View File

@ -1,5 +1,6 @@
package com.rusefi.tools;
import com.devexperts.logging.Logging;
import com.rusefi.auth.AutoTokenUtil;
import com.rusefi.autodetect.PortDetector;
import com.rusefi.proxy.NetworkConnector;
@ -7,6 +8,7 @@ import com.rusefi.tools.online.ProxyClient;
import com.rusefi.ui.AuthTokenPanel;
public class NetworkConnectorStartup {
private final static Logging log = Logging.getLogging(NetworkConnectorStartup.class);
public static void start() {
String authToken = AuthTokenPanel.getAuthToken();
if (!AutoTokenUtil.isToken(authToken)) {
@ -21,6 +23,6 @@ public class NetworkConnectorStartup {
}
NetworkConnector.NetworkConnectorResult networkConnectorResult = NetworkConnector.runNetworkConnector(authToken, autoDetectedPort, ProxyClient.SERVER_PORT_FOR_CONTROLLERS);
System.out.println("Running with " + networkConnectorResult.getOneTimeToken());
log.info("Running with oneTimeToken=" + networkConnectorResult.getOneTimeToken());
}
}