[plc4x] branch bugfix/PLC4X-158-too-many-open-files updated (9cb8d60 -> ee6b115)

[jf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jfeinauer pushed a change to branch bugfix/PLC4X-158-too-many-open-files
in repository https://gitbox.apache.org/repos/asf/plc4x.git.


    omit 9cb8d60  Update TriggerCollectorImpl.java
    omit b2594b1  Fixed Issue reported from Alvaro.
    omit a278f8f  PLC4X-158 Add Warning if Scraper is not used with Pooled Driver Manager.
     add 849ea49  PLC4X-163 Fixed Netty Buffer Leaks for S7 Driver.
     add e20671c  [PLC4X-168] Shorter S7 Field Syntax
     new ee6b115  PLC4X-158 Add Warning if Scraper is not used with Pooled Driver Manager.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (9cb8d60)
            \
             N -- N -- N   refs/heads/bugfix/PLC4X-158-too-many-open-files (ee6b115)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../plc4x/java/isotp/protocol/IsoTPProtocol.java   |  6 ++++
 .../org/apache/plc4x/java/s7/model/S7Field.java    | 32 ++++++++++++++++++++--
 .../org/apache/plc4x/java/s7/netty/S7Protocol.java |  8 ++++++
 .../apache/plc4x/java/s7/model/S7FieldTests.java   |  8 ++++--
 4 files changed, 50 insertions(+), 4 deletions(-)

[plc4x] 01/01: PLC4X-158 Add Warning if Scraper is not used with Pooled Driver Manager.

[jf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jfeinauer pushed a commit to branch bugfix/PLC4X-158-too-many-open-files
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit ee6b1156a13f031de6fd1a71f41c0837f99f3458
Author: julian <j....@pragmaticminds.de>
AuthorDate: Wed Feb 5 16:25:57 2020 +0100

    PLC4X-158 Add Warning if Scraper is not used with Pooled Driver Manager.
---
 .../plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java     | 3 +++
 .../triggerhandler/collector/TriggerCollectorImpl.java                | 4 ++++
 2 files changed, 7 insertions(+)

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 7120369..d21a409 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
@@ -137,6 +137,9 @@ public class TriggeredScraperImpl implements Scraper, TriggeredScraperMBean {
     public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut, int poolSizeScheduler, int poolSizeExecutor) {
         this.resultHandler = resultHandler;
         Validate.notEmpty(jobs);
+        if (!(plcDriverManager instanceof PooledPlcDriverManager)) {
+            LOGGER.warn("The Triggered Scraper is intended to be used with a Pooled Connection. In other situations leaks could occur!");
+        }
         this.driverManager = plcDriverManager;
         this.jobs = jobs;
         this.triggerCollector = triggerCollector;
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
index a87cc73..b372331 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
@@ -25,6 +25,7 @@ import org.apache.plc4x.java.api.messages.PlcReadRequest;
 import org.apache.plc4x.java.api.messages.PlcReadResponse;
 import org.apache.plc4x.java.scraper.exception.ScraperException;
 import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,6 +53,9 @@ public class TriggerCollectorImpl implements TriggerCollector {
     private final ExecutorService executorService;
 
     public TriggerCollectorImpl(PlcDriverManager plcDriverManager, long schedulerInterval, long futureTimeout, int poolSizeScheduler, int poolSizeExecutor) {
+        if (!(plcDriverManager instanceof PooledPlcDriverManager)) {
+            logger.warn("The Triggered Scraper is intended to be used with a Pooled Connection. In other situations leaks could occur!");
+        }
         this.plcDriverManager = plcDriverManager;
         this.currentRequestElements = new ConcurrentHashMap<>();
         this.schedulerInterval = schedulerInterval;