Repository: mesos Updated Branches: refs/heads/master 47f16b909 -> 9ff4b5172
Improved the wording in COMMAND health check logs. Review: https://reviews.apache.org/r/56288/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b97d682a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b97d682a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b97d682a Branch: refs/heads/master Commit: b97d682a91dbbb9312d13425c7832dace14aa799 Parents: 37b9772 Author: Gastón Kleiman <[email protected]> Authored: Fri Mar 24 00:44:43 2017 +0100 Committer: Alexander Rukletsov <[email protected]> Committed: Fri Mar 24 00:56:22 2017 +0100 ---------------------------------------------------------------------- src/checks/health_checker.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b97d682a/src/checks/health_checker.cpp ---------------------------------------------------------------------- diff --git a/src/checks/health_checker.cpp b/src/checks/health_checker.cpp index a26e9b5..236d07b 100644 --- a/src/checks/health_checker.cpp +++ b/src/checks/health_checker.cpp @@ -400,8 +400,7 @@ Future<Nothing> HealthCheckerProcess::commandHealthCheck() } return Failure( - "Command has not returned after " + stringify(timeout) + - "; aborting"); + "Command timed out after " + stringify(timeout) + "; aborting"); }) .then([](const Option<int>& status) -> Future<Nothing> { if (status.isNone()) { @@ -483,7 +482,7 @@ Future<Nothing> HealthCheckerProcess::httpHealthCheck() } return Failure( - string(HTTP_CHECK_COMMAND) + " has not returned after " + + string(HTTP_CHECK_COMMAND) + " timed out after " + stringify(timeout) + "; aborting"); }) .then(defer(self(), &Self::_httpHealthCheck, lambda::_1)); @@ -609,7 +608,7 @@ Future<Nothing> HealthCheckerProcess::tcpHealthCheck() } return Failure( - string(TCP_CHECK_COMMAND) + " has not returned after " + + string(TCP_CHECK_COMMAND) + " timed out after " + stringify(timeout) + "; aborting"); }) .then(defer(self(), &Self::_tcpHealthCheck, lambda::_1));
