[mercedesme] Adjust logging (#20468)

lsiepel · web-flow · commit 15dc1993aa54 · 2026-05-03T11:38:08.000+02:00
* Adjust logging

Signed-off-by: Leo Siepel &lt;leosiepel@gmail.com&gt;
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/api/Authorization.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/api/Authorization.java
@@ -146,9 +146,16 @@ private void refreshToken() {
                 logger.warn("Failed to refresh token {} {}", tokenResponseStatus, tokenResponse);
             }
             listener.onAccessTokenResponse(token);
-        } catch (InterruptedException | TimeoutException | ExecutionException | UnsupportedEncodingException
-                | JsonSyntaxException e) {
-            logger.info("Failed to refresh token {}", e.getMessage());
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            logger.warn("Token refresh interrupted: {}", e.getMessage());
+            return;
+        } catch (TimeoutException | ExecutionException | UnsupportedEncodingException | JsonSyntaxException e) {
+            if (logger.isTraceEnabled()) {
+                logger.warn("Failed to refresh token", e);
+            } else {
+                logger.warn("Failed to refresh token {}", e.getMessage());
+            }
         }
     }
 
@@ -456,10 +463,14 @@ private void requestAccessToken(HttpClient loginHttpClient, String authCode, Str
         String tokenResponseString = tokenResponse.getContentAsString();
         if (status == HttpStatus.OK_200) {
             storeToken(tokenResponseString);
-            logger.info("Successfully resumed login");
+            logger.debug("Successfully resumed login");
         } else {
             handleInvalidToken();
-            logger.info("Failed resume login {} {}", status, tokenResponse.getContentAsString());
+            if (logger.isTraceEnabled()) {
+                logger.warn("Failed resume login {} {}", status, tokenResponseString);
+            } else {
+                logger.warn("Failed resume login {}", status);
+            }
         }
     }
 
@@ -506,7 +517,10 @@ protected void addAuthHeaders(Request request) {
     protected ContentResponse send(Request request) throws MercedesMeApiException {
         try {
             return request.timeout(Constants.REQUEST_TIMEOUT_MS, TimeUnit.MILLISECONDS).send();
-        } catch (InterruptedException | TimeoutException | ExecutionException e) {
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new MercedesMeApiException(request.getPath() + request.getQuery() + " - " + e.getMessage());
+        } catch (TimeoutException | ExecutionException e) {
             logger.warn("Failed request {}{} - {}", request.getPath(), request.getQuery(), e.getMessage());
             throw new MercedesMeApiException(request.getPath() + request.getQuery() + " - " + e.getMessage());
         }
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/api/Websocket.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/api/Websocket.java
@@ -184,13 +184,16 @@ public void websocketKeepAlive(boolean alive) {
     private boolean sendMessage() {
         if (!commandQueue.isEmpty()) {
             ClientMessage message = commandQueue.remove(0);
-            logger.trace("Send Message {}", message.getAllFields());
+            if (logger.isTraceEnabled()) {
+                logger.trace("Send Message {}", message.getAllFields());
+            }
             try {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 message.writeTo(baos);
                 Session localSession = session;
                 if (localSession != null) {
                     localSession.getRemote().sendBytes(ByteBuffer.wrap(baos.toByteArray()));
+                    logger.trace("Send Message {} done", message.getAllFields());
                     return true;
                 } else {
                     logger.warn("Cannot send message {} - no session available", message.getAllFields());
@@ -199,7 +202,6 @@ private boolean sendMessage() {
             } catch (IOException e) {
                 logger.warn("Error sending message {} : {}", message.getAllFields(), e.getMessage());
             }
-            logger.info("Send Message {} done", message.getAllFields());
         }
         return false;
     }
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java
@@ -211,7 +211,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
 
         AccountHandler localAccountHandler = accountHandler;
         if (localAccountHandler == null) {
-            logger.info("Sending command not possible without active account");
+            logger.warn("Sending command not possible without active account");
             return;
         }
         var crBuilder = CommandRequest.newBuilder().setVin(config.vin).setRequestId(UUID.randomUUID().toString());
@@ -1162,7 +1162,7 @@ public Collection<Class<? extends ThingHandlerService>> getServices() {
     public void sendPoi(JSONObject poi) {
         AccountHandler localAccountHandler = accountHandler;
         if (localAccountHandler == null) {
-            logger.info("Sending POI not possible without active account");
+            logger.warn("Sending POI not possible without active account");
             return;
         }
         localAccountHandler.sendPoi(config.vin, poi);
diff --git a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/StatusTests.java b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/StatusTests.java
@@ -54,6 +54,7 @@ public static void tearDown(AccountHandlerMock ahm) {
         try {
             Thread.sleep(250);
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             fail();
         }
     }
@@ -76,7 +77,10 @@ public static HttpClient getHttpClient(int tokenResponseCode) {
             String tokenResponse = FileReader.readFileInString("src/test/resources/json/TokenResponse.json");
             when(response.getContentAsString()).thenReturn(tokenResponse);
             when(clientRequest.send()).thenReturn(response);
-        } catch (InterruptedException | TimeoutException | ExecutionException e) {
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            fail(e.getMessage());
+        } catch (TimeoutException | ExecutionException e) {
             fail(e.getMessage());
         }
         return httpClient;
diff --git a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/internal/handler/ThingCallbackListener.java b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/internal/handler/ThingCallbackListener.java
@@ -94,6 +94,7 @@ public void waitForUpdates() {
                 try {
                     updatesReceived.wait(50);
                 } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                     fail();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public static void tearDown(AccountHandlerMock ahm) {`
`54`	`54`	`try {`
`55`	`55`	`Thread.sleep(250);`
`56`	`56`	`} catch (InterruptedException e) {`
	`57`	`+ Thread.currentThread().interrupt();`
`57`	`58`	`fail();`
`58`	`59`	`}`
`59`	`60`	`}`
`@@ -76,7 +77,10 @@ public static HttpClient getHttpClient(int tokenResponseCode) {`
`76`	`77`	`String tokenResponse = FileReader.readFileInString("src/test/resources/json/TokenResponse.json");`
`77`	`78`	`when(response.getContentAsString()).thenReturn(tokenResponse);`
`78`	`79`	`when(clientRequest.send()).thenReturn(response);`
`79`		`- } catch (InterruptedException \| TimeoutException \| ExecutionException e) {`
	`80`	`+ } catch (InterruptedException e) {`
	`81`	`+ Thread.currentThread().interrupt();`
	`82`	`+ fail(e.getMessage());`
	`83`	`+ } catch (TimeoutException \| ExecutionException e) {`
`80`	`84`	`fail(e.getMessage());`
`81`	`85`	`}`
`82`	`86`	`return httpClient;`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ public void waitForUpdates() {`
`94`	`94`	`try {`
`95`	`95`	`updatesReceived.wait(50);`
`96`	`96`	`} catch (InterruptedException e) {`
	`97`	`+ Thread.currentThread().interrupt();`
`97`	`98`	`fail();`
`98`	`99`	`}`
`99`	`100`	`}`