Better exception logging for modbus

micw · Oct 15, 2024 · a00d57b · a00d57b
1 parent 5110de1
commit a00d57b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/de/wyraz/homedatabroker/config/AbstractComponent.java b/src/main/java/de/wyraz/homedatabroker/config/AbstractComponent.java
@@ -26,9 +26,13 @@ protected void setupLogger() {
 		log = LoggerFactory.getLogger(getClass().getName()+"."+id);
 	}
 
+	protected String getCanonicalExceptionMessage(Exception exception) {
+		return exception.getMessage();
+	}
+
 	protected boolean checkLastException(Exception newException) {
 		if (lastException==null || lastException.getClass()!=newException.getClass() ||
-				!lastException.getMessage().equals(newException.getMessage())) {
+				!getCanonicalExceptionMessage(lastException).equals(getCanonicalExceptionMessage(newException))) {
 			lastException=newException;
 			return false;
 		}

diff --git a/src/main/java/de/wyraz/homedatabroker/source/ModBusIPSource.java b/src/main/java/de/wyraz/homedatabroker/source/ModBusIPSource.java
@@ -6,6 +6,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.ghgande.j2mod.modbus.ModbusIOException;
 import com.ghgande.j2mod.modbus.msg.ReadInputRegistersRequest;
 import com.ghgande.j2mod.modbus.msg.ReadInputRegistersResponse;
 
@@ -160,6 +161,14 @@ protected void schedule() {
 		}
 	}
 
+	protected String getCanonicalExceptionMessage(Exception exception) {
+		if (exception instanceof ModbusIOException) {
+			String message=exception.getMessage();
+			message=message.replaceAll("^Executing transaction .*? failed \\(tried \\d+ times\\) ","");
+			return message;
+		}
+		return super.getCanonicalExceptionMessage(exception);
+	}
 
 	// FIXME: copied from my SML decode - de-dupplicate later
 	public Number scaleNumber(Number value, Number scaler) {