Repository: camel Updated Branches: refs/heads/master 04203dadf -> 3cc05a4bd
Polished warning Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9714db67 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9714db67 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9714db67 Branch: refs/heads/master Commit: 9714db679bec56888693a086d85501290569f191 Parents: 04203da Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Oct 1 09:47:13 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Oct 1 09:47:13 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/impl/DefaultShutdownStrategy.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9714db67/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 d82a5bd..def82f7 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 @@ -194,11 +194,13 @@ 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. Some resources may still be running."); + LOG.warn("Timeout occurred during graceful shutdown. Aborting the shutdown now." + + " Notice: some resources may still be running as graceful shutdown did not complete successfully."); return false; } else { if (forceShutdown || shutdownNowOnTimeout) { - LOG.warn("Timeout occurred. Forcing the routes to be shutdown now. Some resources may still be running."); + LOG.warn("Timeout occurred during graceful shutdown. Forcing the routes to be shutdown now." + + " Notice: some resources may still be running as graceful shutdown did not complete successfully."); // force the routes to shutdown now shutdownRoutesNow(routesOrdered); @@ -209,7 +211,8 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS } } } else { - LOG.warn("Timeout occurred. Will ignore shutting down the remainder routes. Some resources may still be running."); + LOG.warn("Timeout occurred during graceful shutdown. Will ignore shutting down the remainder routes." + + " Notice: some resources may still be running as graceful shutdown did not complete successfully."); } } } finally {
