This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository
https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
The following commit(s) were added to refs/heads/dev by this push:
new acd1ecb Change exception handling in PLC adapter
acd1ecb is described below
commit acd1ecb7407f1684a8202812dfb66ffd53c6e298
Author: Philipp Zehnder <[email protected]>
AuthorDate: Wed Aug 5 11:55:43 2020 +0200
Change exception handling in PLC adapter
---
.../connect/adapters/plc4x/s7/Plc4xS7Adapter.java | 38 +++++++++++++---------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git
a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
index 34fb108..ae06a59 100644
---
a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
+++
b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
@@ -33,6 +33,7 @@ import org.apache.streampipes.connect.adapter.Adapter;
import org.apache.streampipes.connect.adapter.exception.AdapterException;
import org.apache.streampipes.connect.adapter.util.PollingSettings;
import org.apache.streampipes.connect.adapters.PullAdapter;
+import org.apache.streampipes.connect.protocol.stream.KafkaProtocol;
import org.apache.streampipes.model.AdapterType;
import
org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
@@ -52,6 +53,8 @@ import org.apache.streampipes.sdk.helpers.Locales;
import org.apache.streampipes.sdk.helpers.Options;
import org.apache.streampipes.sdk.utils.Assets;
import org.apache.streampipes.sdk.utils.Datatypes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.FileNotFoundException;
import java.io.FileReader;
@@ -70,6 +73,8 @@ public class Plc4xS7Adapter extends PullAdapter {
*/
public static final String ID =
"org.apache.streampipes.connect.adapters.plc4x.s7";
+ Logger LOG = LoggerFactory.getLogger(Plc4xS7Adapter.class);
+
/**
* Keys of user configuration parameters
*/
@@ -212,27 +217,28 @@ public class Plc4xS7Adapter extends PullAdapter {
PlcReadResponse response = null;
try {
response = readRequest.execute().get();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
- e.printStackTrace();
- }
- // Create an event containing the value of the PLC
- Map<String, Object> event = new HashMap<>();
- for (Map<String, String> node : this.nodes) {
- if(response.getResponseCode(node.get(PLC_NODE_NAME)) ==
PlcResponseCode.OK) {
- event.put(node.get(PLC_NODE_RUNTIME_NAME),
response.getObject(node.get(PLC_NODE_NAME)));
- }
+ // Create an event containing the value of the PLC
+ Map<String, Object> event = new HashMap<>();
+ for (Map<String, String> node : this.nodes) {
+ if(response.getResponseCode(node.get(PLC_NODE_NAME)) ==
PlcResponseCode.OK) {
+ event.put(node.get(PLC_NODE_RUNTIME_NAME),
response.getObject(node.get(PLC_NODE_NAME)));
+ }
- else {
- logger.error("Error[" + node.get(PLC_NODE_NAME) + "]: " +
-
response.getResponseCode(node.get(PLC_NODE_NAME)).name());
+ else {
+ logger.error("Error[" + node.get(PLC_NODE_NAME) + "]: " +
+
response.getResponseCode(node.get(PLC_NODE_NAME)).name());
+ }
}
+
+ // publish the final event
+ adapterPipeline.process(event);
+ } catch (InterruptedException e) {
+ LOG.error(e.getMessage());
+ } catch (ExecutionException e) {
+ LOG.error(e.getMessage());
}
- // publish the final event
- adapterPipeline.process(event);
}