You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2019/11/05 09:43:24 UTC
[plc4x] branch develop updated: [AB-ETH] Add fine grained logging
in debug / trace
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new d62aae4 [AB-ETH] Add fine grained logging in debug / trace
d62aae4 is described below
commit d62aae4c1daccb2f272aba76026a8c5aa8cd8052
Author: julian <j....@pragmaticminds.de>
AuthorDate: Tue Nov 5 10:43:17 2019 +0100
[AB-ETH] Add fine grained logging in debug / trace
---
.../org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java | 2 +-
.../java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java | 5 +++++
.../org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java | 4 ++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
index 113cae3..8674262 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
@@ -47,7 +47,6 @@ public class AbEthPlcConnection extends NettyPlcConnection implements PlcReader
public AbEthPlcConnection(InetAddress address, String params) {
this(new TcpSocketChannelFactory(address, AB_ETH_PORT), params);
-
logger.info("Setting up AB-ETH Connection with: host-name {}", address.getHostAddress());
}
@@ -73,6 +72,7 @@ public class AbEthPlcConnection extends NettyPlcConnection implements PlcReader
@Override
protected void sendChannelCreatedEvent() {
+ logger.trace("Channel was created, firing ChannelCreated Event");
// Send an event to the pipeline telling the Protocol filters what's going on.
channel.pipeline().fireUserEventTriggered(new ConnectEvent());
}
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
index 24cd162..d4e5585 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
@@ -26,9 +26,13 @@ import org.apache.plc4x.java.utils.MessageIO;
import org.apache.plc4x.java.utils.ParseException;
import org.apache.plc4x.java.utils.ReadBuffer;
import org.apache.plc4x.java.utils.WriteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AbEthProtocol extends GeneratedDriverByteToMessageCodec<CIPEncapsulationPacket> {
+ private static final Logger logger = LoggerFactory.getLogger(AbEthProtocol.class);
+
public AbEthProtocol() {
super(new MessageIO<CIPEncapsulationPacket, CIPEncapsulationPacket>() {
@Override
@@ -41,6 +45,7 @@ public class AbEthProtocol extends GeneratedDriverByteToMessageCodec<CIPEncapsul
CIPEncapsulationPacketIO.serialize(io, value);
}
});
+ logger.trace("Created new AB-ETH protocol");
}
@Override
diff --git a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
index 4b1bc2c..60c2f88 100644
--- a/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
+++ b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
@@ -60,11 +60,13 @@ public class Plc4xAbEthProtocol extends PlcMessageToMessageCodec<CIPEncapsulatio
private Map<Integer, PlcRequestContainer> requests;
public Plc4xAbEthProtocol() {
+ logger.trace("Created new instance of PLC4X-AB-ETH Protocol");
this.requests = new HashMap<>();
}
@Override
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+ logger.trace("Registered user event {}", evt);
// If the connection has just been established, start setting up the connection
// by sending a connection request to the plc.
if (evt instanceof ConnectEvent) {
@@ -80,6 +82,7 @@ public class Plc4xAbEthProtocol extends PlcMessageToMessageCodec<CIPEncapsulatio
@Override
protected void encode(ChannelHandlerContext ctx, PlcRequestContainer msg, List<Object> out) throws Exception {
+ logger.trace("Encoding {}", msg);
PlcRequest request = msg.getRequest();
// reset counter since two byte values are possible in DF1
@@ -118,6 +121,7 @@ public class Plc4xAbEthProtocol extends PlcMessageToMessageCodec<CIPEncapsulatio
@Override
protected void decode(ChannelHandlerContext ctx, CIPEncapsulationPacket packet, List<Object> out) throws Exception {
+ logger.trace("Received {}, decoding...", packet);
if(packet instanceof CIPEncapsulationConnectionResponse) {
CIPEncapsulationConnectionResponse connectionResponse = (CIPEncapsulationConnectionResponse) packet;
// Save the session handle