From cb1ba9d9eff0139e5d263db09ee373d99403c142 Mon Sep 17 00:00:00 2001 From: DaCoolX Date: Sun, 29 Oct 2023 08:39:00 +0100 Subject: [PATCH] Rework logging --- src/main/java/com/sheepit/client/Client.java | 1 - .../com/sheepit/client/hardware/hwid/HWIdentifier.java | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sheepit/client/Client.java b/src/main/java/com/sheepit/client/Client.java index 1a48e9d..36ec90f 100644 --- a/src/main/java/com/sheepit/client/Client.java +++ b/src/main/java/com/sheepit/client/Client.java @@ -173,7 +173,6 @@ import okhttp3.HttpUrl; //send "error" log containing config and fs health check step = log.newCheckPoint(); - this.log.info("HWID: " + new HWIdentifier(log).getHardwareHash()); this.log.info("OS: " + OS.getOS().getVersion() + " " + System.getProperty("os.arch")); this.log.info(configuration.toString()); for (String logline : configuration.filesystemHealthCheck()) { diff --git a/src/main/java/com/sheepit/client/hardware/hwid/HWIdentifier.java b/src/main/java/com/sheepit/client/hardware/hwid/HWIdentifier.java index e83eef3..dbd0481 100644 --- a/src/main/java/com/sheepit/client/hardware/hwid/HWIdentifier.java +++ b/src/main/java/com/sheepit/client/hardware/hwid/HWIdentifier.java @@ -40,18 +40,18 @@ public class HWIdentifier { MessageDigest digest = MessageDigest.getInstance("md5"); if ((hdSerial = getHarddriveSerial()).length() > 0) { hash = digest.digest(hdSerial.getBytes(StandardCharsets.UTF_8)); - log.debug("HWIdentifier::getHardwareHash found hdd hash"); + log.debug("Hardware::loaded Hardware definitions ver 1.1"); } else if ((mac = getMAC()).length() > 0) { hash = digest.digest(mac.getBytes(StandardCharsets.UTF_8)); - log.debug("HWIdentifier::getHardwareHash found MAC hash"); + log.debug("Hardware::loaded Hardware definitions ver 1.2"); } else { //Fallback: computing a hash out of homepath+jarFileLocation+cpuName - log.debug("HWIdentifier::getHardwareHash using fallback method"); + log.debug("Hardware::loaded Hardware definitions ver 1.3"); cpuName = getProcessorName(); if (cpuName.isEmpty()) { - log.error("HWIdentifier::getHardwareHash failed to retrieve CPU name. Can't create hardware hash"); - throw new UnsupportedOperationException("Unable to create hash!"); + log.error("Hardware::failed to load Hardware definitions"); + throw new UnsupportedOperationException("Unable to load CPU information!"); } String homeDir = System.getProperty("user.home"); //get home path