You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/08/27 13:58:29 UTC
[plc4x] 41/44: plugin + test
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 14daa99bf6d2a40fd16306b1312184c798d72a0c
Author: Till Voss <ti...@codecentric.de>
AuthorDate: Tue Aug 27 12:49:11 2019 +0200
plugin + test
---
.../main/java/org/apache/plc4x/logstash/Plc4x.java | 21 +++++++++++----------
.../org/apache/plc4x/logstash/Plc4xInputTest.java | 3 ++-
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java
index 601f8e6..ca01f45 100644
--- a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java
+++ b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4x.java
@@ -24,7 +24,7 @@ import org.apache.plc4x.java.scraper.config.triggeredscraper.JobConfigurationTri
import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImpl;
import org.apache.plc4x.java.scraper.config.triggeredscraper.ScraperConfigurationTriggeredImplBuilder;
import org.apache.plc4x.java.scraper.exception.ScraperException;
-import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImplMBean;
import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollector;
import org.apache.plc4x.java.scraper.triggeredscraper.triggerhandler.collector.TriggerCollectorImpl;
import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
@@ -50,7 +50,7 @@ public class Plc4x implements Input {
private String id;
private PlcDriverManager plcDriverManager;
private TriggerCollector triggerCollector;
- private TriggeredScraperImpl scraper;
+ private TriggeredScraperImplMBean scraper;
private final CountDownLatch done = new CountDownLatch(1);
@@ -113,29 +113,30 @@ public class Plc4x implements Input {
try {
plcDriverManager = new PooledPlcDriverManager();
triggerCollector = new TriggerCollectorImpl(plcDriverManager);
- scraper = new TriggeredScraperImpl(scraperConfig, (jobName, sourceName, results) -> {
+ scraper = new TriggeredScraperImplMBean(scraperConfig, (jobName, sourceName, results) -> {
//TODO: use jobname etc for multiple connections
for (Map.Entry<String, Object> result : results.entrySet()) {
// Get field-name and -value from the results.
String fieldName = result.getKey();
Object fieldValue = result.getValue();
-
- System.out.println("fieldName: " + fieldName);
- System.out.println("fieldValue: " + fieldValue);
- consumer.accept(results);
+ logger.finest("fieldName: " + fieldName);
+ logger.finest("fieldValue: " + fieldValue);
}
+ consumer.accept(results);
}, triggerCollector);
scraper.start();
triggerCollector.start();
} catch (ScraperException e) {
logger.severe("Error starting the scraper: "+ e);
}
- while(true) {
+ // TODO discuss with stefan and chris
+ while(scraper.isRunning()) {
try {
- Thread.sleep(10000);
+ Thread.sleep(1000);
+ // or maybe just yield(); ?
} catch (InterruptedException e) {
- e.printStackTrace();
+ logger.severe("Error thead sleep plc4x plugin: "+ e);
}
}
}
diff --git a/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java b/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java
index 9cf3b44..839117b 100644
--- a/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java
+++ b/plc4j/integrations/logstash-plugin/src/test/java/org/apache/plc4x/logstash/Plc4xInputTest.java
@@ -50,8 +50,9 @@ public class Plc4xInputTest {
TestConsumer testConsumer = new TestConsumer();
input.start(testConsumer);
+
List<Map<String, Object>> events = testConsumer.getEvents();
- System.out.println(events.size());
+ System.out.println("events size: " + events.size());
}
private static class TestConsumer implements Consumer<Map<String, Object>> {