Repository: camel Updated Branches: refs/heads/master 9497ad1ed -> 5d54b3973
First part of CAMEL-7482, update log messages on timeout Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/15f60b9b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/15f60b9b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/15f60b9b Branch: refs/heads/master Commit: 15f60b9b78d885b791d4dca4789b44671b6b02d5 Parents: 4c58572 Author: Kevin Earls <[email protected]> Authored: Fri Jun 6 14:34:16 2014 +0200 Committer: Kevin Earls <[email protected]> Committed: Fri Jun 6 14:34:16 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/impl/DefaultShutdownStrategy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/15f60b9b/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 2d05aea..e94c0b1 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 @@ -195,11 +195,11 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS // if set, stop processing and return false to indicate that the shutdown is aborting if (!forceShutdown && abortAfterTimeout) { - LOG.warn("Timeout occurred. Aborting the shutdown now."); + LOG.warn("Timeout occurred. Aborting the shutdown now. Some resources may still be running."); return false; } else { if (forceShutdown || shutdownNowOnTimeout) { - LOG.warn("Timeout occurred. Forcing the routes to be shutdown now."); + LOG.warn("Timeout occurred. Forcing the routes to be shutdown now. Some resources may still be running."); // force the routes to shutdown now shutdownRoutesNow(routesOrdered); @@ -210,7 +210,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS } } } else { - LOG.warn("Timeout occurred. Will ignore shutting down the remainder routes."); + LOG.warn("Timeout occurred. Will ignore shutting down the remainder routes. Some resources may still be running."); } } } finally {
