You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/08/07 18:51:22 UTC
mesos git commit: Tweaked checker logs to avoid repeated information.
Repository: mesos
Updated Branches:
refs/heads/master 36c48d81e -> 79028f37e
Tweaked checker logs to avoid repeated information.
Macro `WSTRINGIFY` already prints some test before printing the exit
code of the command or termination signal. Hence adding "returned"
word prior to invoking this macro is not necessary and might even be
misleading.
Review: https://reviews.apache.org/r/61455
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/79028f37
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/79028f37
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/79028f37
Branch: refs/heads/master
Commit: 79028f37ea2232fa39cce68d5bfd192c0099d6f9
Parents: 36c48d8
Author: Alexander Rukletsov <al...@apache.org>
Authored: Mon Aug 7 12:46:05 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Aug 7 12:46:29 2017 +0200
----------------------------------------------------------------------
src/checks/checker_process.cpp | 8 ++++----
src/checks/health_checker.cpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/79028f37/src/checks/checker_process.cpp
----------------------------------------------------------------------
diff --git a/src/checks/checker_process.cpp b/src/checks/checker_process.cpp
index d92588e..30dda0e 100644
--- a/src/checks/checker_process.cpp
+++ b/src/checks/checker_process.cpp
@@ -847,14 +847,14 @@ Future<int> CheckerProcess::_httpCheck(
const Future<string>& error = std::get<2>(t);
if (!error.isReady()) {
return Failure(
- string(HTTP_CHECK_COMMAND) + " returned " +
- WSTRINGIFY(exitCode) + "; reading stderr failed: " +
+ string(HTTP_CHECK_COMMAND) + " " + WSTRINGIFY(exitCode) +
+ "; reading stderr failed: " +
(error.isFailed() ? error.failure() : "discarded"));
}
return Failure(
- string(HTTP_CHECK_COMMAND) + " returned " +
- WSTRINGIFY(exitCode) + ": " + error.get());
+ string(HTTP_CHECK_COMMAND) + " " + WSTRINGIFY(exitCode) + ": " +
+ error.get());
}
const Future<string>& output = std::get<1>(t);
http://git-wip-us.apache.org/repos/asf/mesos/blob/79028f37/src/checks/health_checker.cpp
----------------------------------------------------------------------
diff --git a/src/checks/health_checker.cpp b/src/checks/health_checker.cpp
index 41fd949..d4bda6e 100644
--- a/src/checks/health_checker.cpp
+++ b/src/checks/health_checker.cpp
@@ -139,7 +139,7 @@ static Try<Nothing> interpretCheckStatusInfo(const CheckStatusInfo& result)
case CheckInfo::COMMAND: {
const int exitCode = result.command().exit_code();
if (exitCode != 0) {
- return Error("Command returned: " + WSTRINGIFY(exitCode));
+ return Error("Command " + WSTRINGIFY(exitCode));
}
break;