You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by tm...@apache.org on 2019/05/02 08:34:24 UTC
[plc4x] branch Scraper_improvement updated: minor improvements
This is an automated email from the ASF dual-hosted git repository.
tmitsch pushed a commit to branch Scraper_improvement
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/Scraper_improvement by this push:
new cd79495 minor improvements
cd79495 is described below
commit cd7949552bf0a4b25b035484aefadc2ec5f858b0
Author: Tim Mitsch <t....@pragmaticindustries.de>
AuthorDate: Thu May 2 10:34:16 2019 +0200
minor improvements
---
.../scraper/triggeredscraper/TriggeredScraperImpl.java | 17 +++++++++++++----
.../triggerhandler/TriggerConfiguration.java | 4 ++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
index bbd4449..58c756e 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
@@ -89,6 +89,16 @@ public class TriggeredScraperImpl implements Scraper {
}
/**
+ * Creates a Scraper instance from a configuration.
+ * @param config Configuration to use.
+ * @param plcDriverManager external DriverManager
+ * @param resultHandler
+ */
+ public TriggeredScraperImpl(TriggeredScraperConfiguration config, PlcDriverManager plcDriverManager, ResultHandler resultHandler) throws ScraperException {
+ this(resultHandler, plcDriverManager, config.getJobs());
+ }
+
+ /**
* Min Idle per Key is set to 1 for situations where the network is broken.
* Then, on reconnect we can fail all getConnection calls (in the ScraperTask) fast until
* (in the background) the idle connection is created and the getConnection call returns fast.
@@ -127,20 +137,19 @@ public class TriggeredScraperImpl implements Scraper {
tuple -> {
LOGGER.debug("Register task for job {} for conn {} ({}) at rate {} ms",
tuple.getLeft().getJobName(), tuple.getMiddle(), tuple.getRight(), tuple.getLeft().getScrapeRate());
- TriggeredScraperTask task =
- null;
+ TriggeredScraperTask task;
try {
task = new TriggeredScraperTask(driverManager,
tuple.getLeft().getJobName(),
tuple.getMiddle(),
tuple.getRight(),
tuple.getLeft().getFields(),
- 1_000,
+ 2_500,
executorService,
resultHandler,
(TriggeredScrapeJobImpl) tuple.getLeft());
// Add task to internal list
- System.out.println(task);
+ LOGGER.info("Task {} added to scheduling", task);
tasks.put(tuple.getLeft(), task);
ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(task,
0, tuple.getLeft().getScrapeRate(), TimeUnit.MILLISECONDS);
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
index 111979a..db48044 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
@@ -189,6 +189,9 @@ public class TriggerConfiguration{
public boolean evaluateTrigger() throws ScraperException {
List<Boolean> triggerResultList = new ArrayList<>();
+ if(logger.isTraceEnabled()){
+ logger.trace("eval values: {}",acquiredValuesList);
+ }
for(int countElements=0; countElements<acquiredValuesList.size();countElements++){
TriggerElement triggerElement = triggerElementList.get(countElements);
Object acquiredObject = acquiredValuesList.get(countElements);
@@ -244,6 +247,7 @@ public class TriggerConfiguration{
triggerElement.setCompareValue(currentValue);
triggerElement.setReservedCompareValue(currentValue);
triggerResultList.add(true);
+ logger.trace("Initially set compare value to {}",currentValue);
skipComparison=true;
return true;
}