From 59eb505f6e91bb50267594ae7d903d30305c0222 Mon Sep 17 00:00:00 2001 From: arnab Date: Tue, 6 Feb 2024 11:18:08 -0600 Subject: [PATCH 1/3] Check Scale connect status before acquiring lock --- .../com/target/devicemanager/components/scale/ScaleManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/target/devicemanager/components/scale/ScaleManager.java b/src/main/java/com/target/devicemanager/components/scale/ScaleManager.java index 9520117..81f3805 100644 --- a/src/main/java/com/target/devicemanager/components/scale/ScaleManager.java +++ b/src/main/java/com/target/devicemanager/components/scale/ScaleManager.java @@ -113,7 +113,7 @@ void subscribeToLiveWeight(SseEmitter liveWeightEmitter) throws IOException { } public FormattedWeight getStableWeight(CompletableFuture stableWeightClient) throws ScaleException { - if (scaleDevice.tryLock() && isScaleReady()) { + if (isScaleReady() && scaleDevice.tryLock()) { //Create new future and add it to the list stableWeightClients.add(stableWeightClient); scaleDevice.startStableWeightRead(STABLE_WEIGHT_TIMEOUT_MSEC); From 34990bc2a2acebced2cdce9ea104f9bf1fb0987a Mon Sep 17 00:00:00 2001 From: arnab Date: Wed, 14 Feb 2024 14:24:51 -0600 Subject: [PATCH 2/3] changed log level --- .../target/devicemanager/components/scale/ScaleDevice.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java b/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java index 8593073..d92c3f8 100644 --- a/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java +++ b/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java @@ -203,9 +203,9 @@ void startStableWeightRead(int timeout) { return; } catch (JposException jposException) { if(isConnected()) { - LOGGER.error(MARKER, "Scale Failed to Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); + LOGGER.trace(MARKER, "Scale Failed to Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); } else { - LOGGER.error(MARKER, "Scale not connected in Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); + LOGGER.trace(MARKER, "Scale not connected in Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); } if(jposException.getErrorCode() != JposConst.JPOS_E_TIMEOUT) { fireScaleWeightErrorEvent(jposException); From 4b651800b640dcdea64f968c53888db852a278d4 Mon Sep 17 00:00:00 2001 From: arnab Date: Wed, 14 Feb 2024 15:22:56 -0600 Subject: [PATCH 3/3] changed marker --- .../target/devicemanager/components/scale/ScaleDevice.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java b/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java index d92c3f8..5e53230 100644 --- a/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java +++ b/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java @@ -203,9 +203,9 @@ void startStableWeightRead(int timeout) { return; } catch (JposException jposException) { if(isConnected()) { - LOGGER.trace(MARKER, "Scale Failed to Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); + LOGGER.trace("Scale Failed to Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); } else { - LOGGER.trace(MARKER, "Scale not connected in Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); + LOGGER.trace("Scale not connected in Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended()); } if(jposException.getErrorCode() != JposConst.JPOS_E_TIMEOUT) { fireScaleWeightErrorEvent(jposException);