You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/06/28 07:51:44 UTC
[1/2] camel git commit: Regen
Repository: camel
Updated Branches:
refs/heads/master 61ad97f02 -> 203498197
Regen
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20349819
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20349819
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20349819
Branch: refs/heads/master
Commit: 203498197858f8919f7da95a7931a26fef5f9c86
Parents: 14a7cb8
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Jun 28 09:50:42 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jun 28 09:51:31 2017 +0200
----------------------------------------------------------------------
components/readme.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/20349819/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index a7005c3..20ba98d 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -288,7 +288,7 @@ Number of Components: 275 in 189 JAR artifacts (17 deprecated)
`grape:defaultCoordinates` | 2.16 | Grape component allows you to fetch, load and manage additional jars when CamelContext is running.
| link:camel-grpc/src/main/docs/grpc-component.adoc[gRPC] (camel-grpc) +
-`grpc:service` | 2.19 | The gRPC component allows to call and expose remote procedures via HTTP/2 with protobuf dataformat
+`grpc:host:port/service` | 2.19 | The gRPC component allows to call and expose remote procedures via HTTP/2 with protobuf dataformat
| link:camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc[Guava EventBus] (camel-guava-eventbus) +
`guava-eventbus:eventBusRef` | 2.10 | The guava-eventbus component provides integration bridge between Camel and Google Guava EventBus.
[2/2] camel git commit: CAMEL-11470 - Camel-Core:
DefaultShutdownStrategy,
pass the logInflightExchangesOnTimeout to the ShutdownTask
Posted by ac...@apache.org.
CAMEL-11470 - Camel-Core: DefaultShutdownStrategy, pass the logInflightExchangesOnTimeout to the ShutdownTask
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14a7cb88
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14a7cb88
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14a7cb88
Branch: refs/heads/master
Commit: 14a7cb8893d410a90e2679e9584cb269475efc1f
Parents: 61ad97f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Jun 28 09:24:33 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jun 28 09:51:31 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/impl/DefaultShutdownStrategy.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/14a7cb88/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index adc69ff..f06b52b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -197,7 +197,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// use another thread to perform the shutdowns so we can support timeout
timeoutOccurred.set(false);
- currentShutdownTaskFuture = getExecutorService().submit(new ShutdownTask(context, routesOrdered, timeout, timeUnit, suspendOnly, abortAfterTimeout, timeoutOccurred));
+ currentShutdownTaskFuture = getExecutorService().submit(new ShutdownTask(context, routesOrdered, timeout, timeUnit, suspendOnly, abortAfterTimeout, timeoutOccurred, isLogInflightExchangesOnTimeout()));
try {
currentShutdownTaskFuture.get(timeout, timeUnit);
} catch (ExecutionException e) {
@@ -505,9 +505,10 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
private final long timeout;
private final TimeUnit timeUnit;
private final AtomicBoolean timeoutOccurred;
+ private final boolean logInflightExchangesOnTimeout;
ShutdownTask(CamelContext context, List<RouteStartupOrder> routes, long timeout, TimeUnit timeUnit,
- boolean suspendOnly, boolean abortAfterTimeout, AtomicBoolean timeoutOccurred) {
+ boolean suspendOnly, boolean abortAfterTimeout, AtomicBoolean timeoutOccurred, boolean logInflightExchangesOnTimeout) {
this.context = context;
this.routes = routes;
this.suspendOnly = suspendOnly;
@@ -515,6 +516,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
this.timeout = timeout;
this.timeUnit = timeUnit;
this.timeoutOccurred = timeoutOccurred;
+ this.logInflightExchangesOnTimeout = logInflightExchangesOnTimeout;
}
public void run() {
@@ -628,7 +630,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
LOG.info(msg);
// log verbose if DEBUG logging is enabled
- logInflightExchanges(context, routes, false);
+ logInflightExchanges(context, routes, logInflightExchangesOnTimeout);
Thread.sleep(loopDelaySeconds * 1000);
} catch (InterruptedException e) {