You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jm...@apache.org on 2018/01/13 23:41:52 UTC
[incubator-plc4x] branch master updated: fix logging so no side
effects
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push:
new 1c831ad fix logging so no side effects
1c831ad is described below
commit 1c831ad213de8699ab3766f70e615e936ed480a3
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Sun Jan 14 10:41:42 2018 +1100
fix logging so no side effects
---
.../org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +++-
.../src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java | 4 +++-
.../plc4x/java/s7/netty/model/types/DataTransportErrorCode.java | 9 +++++++--
.../apache/plc4x/java/s7/netty/model/types/ParameterType.java | 7 ++++++-
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java
index 88a9b63..03eff35 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java
@@ -78,7 +78,9 @@ public class IsoOnTcpProtocol extends MessageToMessageCodec<ByteBuf, IsoOnTcpMes
// So we just gobble up the header and continue reading in higher levels.
if (in.getByte(0) != ISO_ON_TCP_MAGIC_NUMBER) {
logger.warn("Expecting ISO on TCP magic number: {}", ISO_ON_TCP_MAGIC_NUMBER);
- logger.debug("Got Data: " + ByteBufUtil.hexDump(in));
+ if (logger.isDebugEnabled()) {
+ logger.debug("Got Data: {}", ByteBufUtil.hexDump(in));
+ }
exceptionCaught(ctx, new PlcProtocolException(
String.format("Expecting ISO on TCP magic number: %02X", ISO_ON_TCP_MAGIC_NUMBER)));
return;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index 0622712..db2d598 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -333,7 +333,9 @@ public class S7Protocol extends MessageToMessageCodec<IsoTPMessage, S7Message> {
short pduLength = in.readShort();
return new SetupCommunicationParameter(callingMaxAmq, calledMaxAmq, pduLength);
default:
- logger.error("Unimplemented parameter type: " + parameterType.name());
+ if (logger.isErrorEnabled()) {
+ logger.error("Unimplemented parameter type: {}", parameterType.name());
+ }
}
return null;
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
index 6fc5988..94079a2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
@@ -18,6 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.s7.netty.model.types;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.HashMap;
import java.util.Map;
@@ -28,6 +31,8 @@ public enum DataTransportErrorCode {
NOT_FOUND((byte) 0x0A),
OK((byte) 0xFF);
+ private static final Logger logger = LoggerFactory.getLogger(DataTransportErrorCode.class);
+
private static Map<Byte, DataTransportErrorCode> map = null;
private byte code;
@@ -47,8 +52,8 @@ public enum DataTransportErrorCode {
map.put(dataTransportErrorCode.code, dataTransportErrorCode);
}
}
- if(!map.containsKey(code)) {
- System.out.println("No DataTransportErrorCode for code " + code);
+ if (!map.containsKey(code)) {
+ logger.error("No DataTransportErrorCode for code {}", code);
}
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
index 04d3b65..3883be8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
@@ -18,6 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.s7.netty.model.types;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.HashMap;
import java.util.Map;
@@ -38,6 +41,8 @@ public enum ParameterType {
PLC_STOP((byte) 0x29),
SETUP_COMMUNICATION((byte) 0xF0);
+ private static final Logger logger = LoggerFactory.getLogger(ParameterType.class);
+
private static Map<Byte, ParameterType> map = null;
private final byte code;
@@ -58,7 +63,7 @@ public enum ParameterType {
}
}
if(!map.containsKey(code)) {
- System.out.println("ParameterType for code " + code + " not found");
+ logger.error("ParameterType for code {} not found", code);
}
return map.get(code);
}
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].