Overloaded `<<` for `CheckStatusInfo`. Review: https://reviews.apache.org/r/57696/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9ce5b026 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9ce5b026 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9ce5b026 Branch: refs/heads/master Commit: 9ce5b026922d27c24b63acc90b367a979ea5f1d2 Parents: 7a4f62a Author: Alexander Rukletsov <[email protected]> Authored: Thu Mar 23 17:11:33 2017 +0100 Committer: Alexander Rukletsov <[email protected]> Committed: Fri Mar 24 00:17:27 2017 +0100 ---------------------------------------------------------------------- include/mesos/type_utils.hpp | 5 +++++ include/mesos/v1/mesos.hpp | 5 +++++ src/common/type_utils.cpp | 28 ++++++++++++++++++++++++++++ src/launcher/default_executor.cpp | 3 ++- src/launcher/executor.cpp | 2 +- src/v1/mesos.cpp | 28 ++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9ce5b026/include/mesos/type_utils.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/type_utils.hpp b/include/mesos/type_utils.hpp index 6218743..19f34a7 100644 --- a/include/mesos/type_utils.hpp +++ b/include/mesos/type_utils.hpp @@ -251,6 +251,11 @@ std::ostream& operator<<( const CapabilityInfo& capabilityInfo); +std::ostream& operator<<( + std::ostream& stream, + const CheckStatusInfo& checkStatusInfo); + + std::ostream& operator<<(std::ostream& stream, const CommandInfo& commandInfo); http://git-wip-us.apache.org/repos/asf/mesos/blob/9ce5b026/include/mesos/v1/mesos.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/v1/mesos.hpp b/include/mesos/v1/mesos.hpp index f5e0879..0fecc4a 100644 --- a/include/mesos/v1/mesos.hpp +++ b/include/mesos/v1/mesos.hpp @@ -249,6 +249,11 @@ std::ostream& operator<<( const CapabilityInfo& capabilityInfo); +std::ostream& operator<<( + std::ostream& stream, + const CheckStatusInfo& checkStatusInfo); + + std::ostream& operator<<(std::ostream& stream, const ContainerID& containerId); http://git-wip-us.apache.org/repos/asf/mesos/blob/9ce5b026/src/common/type_utils.cpp ---------------------------------------------------------------------- diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp index 1fce522..3ab2dc1 100644 --- a/src/common/type_utils.cpp +++ b/src/common/type_utils.cpp @@ -468,6 +468,34 @@ ostream& operator<<(ostream& stream, const CapabilityInfo& capabilityInfo) } +ostream& operator<<(ostream& stream, const CheckStatusInfo& checkStatusInfo) +{ + switch (checkStatusInfo.type()) { + case CheckInfo::COMMAND: + if (checkStatusInfo.has_command()) { + stream << "COMMAND"; + if (checkStatusInfo.command().has_exit_code()) { + stream << " exit code " << checkStatusInfo.command().exit_code(); + } + } + break; + case CheckInfo::HTTP: + if (checkStatusInfo.has_http()) { + stream << "HTTP"; + if (checkStatusInfo.http().has_status_code()) { + stream << " status code " << checkStatusInfo.http().status_code(); + } + } + break; + case CheckInfo::UNKNOWN: + stream << "UNKNOWN"; + break; + } + + return stream; +} + + ostream& operator<<(ostream& stream, const CommandInfo& commandInfo) { return stream << JSON::protobuf(commandInfo); http://git-wip-us.apache.org/repos/asf/mesos/blob/9ce5b026/src/launcher/default_executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/default_executor.cpp b/src/launcher/default_executor.cpp index 0d0192a..f19bba9 100644 --- a/src/launcher/default_executor.cpp +++ b/src/launcher/default_executor.cpp @@ -1009,7 +1009,8 @@ protected: return; } - LOG(INFO) << "Received check update for task '" << taskId << "'"; + LOG(INFO) << "Received check update '" << checkStatus + << "' for task '" << taskId << "'"; // Use the previous task status to preserve all attached information. // We always send a `TASK_RUNNING` right after the task is launched. http://git-wip-us.apache.org/repos/asf/mesos/blob/9ce5b026/src/launcher/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp index 978f38a..db703f0 100644 --- a/src/launcher/executor.cpp +++ b/src/launcher/executor.cpp @@ -309,7 +309,7 @@ protected: return; } - cout << "Received check update" << endl; + cout << "Received check update '" << checkStatus << "'" << endl; // Use the previous task status to preserve all attached information. CHECK_SOME(lastTaskStatus); http://git-wip-us.apache.org/repos/asf/mesos/blob/9ce5b026/src/v1/mesos.cpp ---------------------------------------------------------------------- diff --git a/src/v1/mesos.cpp b/src/v1/mesos.cpp index 3d9281d..b21e1e7 100644 --- a/src/v1/mesos.cpp +++ b/src/v1/mesos.cpp @@ -390,6 +390,34 @@ ostream& operator<<(ostream& stream, const CapabilityInfo& capabilityInfo) } +ostream& operator<<(ostream& stream, const CheckStatusInfo& checkStatusInfo) +{ + switch (checkStatusInfo.type()) { + case CheckInfo::COMMAND: + if (checkStatusInfo.has_command()) { + stream << "COMMAND"; + if (checkStatusInfo.command().has_exit_code()) { + stream << " exit code " << checkStatusInfo.command().exit_code(); + } + } + break; + case CheckInfo::HTTP: + if (checkStatusInfo.has_http()) { + stream << "HTTP"; + if (checkStatusInfo.http().has_status_code()) { + stream << " status code " << checkStatusInfo.http().status_code(); + } + } + break; + case CheckInfo::UNKNOWN: + stream << "UNKNOWN"; + break; + } + + return stream; +} + + ostream& operator<<(ostream& stream, const ContainerID& containerId) { return stream << containerId.value();
