You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/12/07 10:09:49 UTC

(camel) 11/15: CAMEL-20189: camel-slack/splunk: Force marking the consumer ready sooner, in case processing exchanges takes too long, causing readiness check to timeout and fail.

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

davsclaus pushed a commit to branch ready
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 82405685f062cad408fbe2304f6177f5711c4e76
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 7 10:53:25 2023 +0100

    CAMEL-20189: camel-slack/splunk: Force marking the consumer ready sooner, in case processing exchanges takes too long, causing readiness check to timeout and fail.
---
 .../src/main/java/org/apache/camel/component/slack/SlackConsumer.java | 3 +++
 .../main/java/org/apache/camel/component/splunk/SplunkConsumer.java   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
index fdac796fda8..d050060ebb3 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
@@ -85,6 +85,9 @@ public class SlackConsumer extends ScheduledBatchPollingConsumer {
             throw new RuntimeCamelException("API request conversations.history to Slack failed: " + response);
         }
 
+        // okay we have some response from slack so lets mark the consumer as ready
+        forceConsumerAsReady();
+
         Queue<Exchange> exchanges = createExchanges(response.getMessages());
         return processBatch(CastUtils.cast(exchanges));
     }
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConsumer.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConsumer.java
index 492b82fb469..c97e35d048d 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConsumer.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkConsumer.java
@@ -75,6 +75,10 @@ public class SplunkConsumer extends ScheduledBatchPollingConsumer {
                 return 0;
             } else {
                 List<SplunkEvent> events = dataReader.read();
+
+                // okay we have some response from splunk so lets mark the consumer as ready
+                forceConsumerAsReady();
+
                 Queue<Exchange> exchanges = createExchanges(events);
                 return processBatch(CastUtils.cast(exchanges));
             }