You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2017/05/24 00:24:38 UTC
mesos git commit: Consistently use EXIT() in agent startup.
Repository: mesos
Updated Branches:
refs/heads/master 21caae3bd -> 999aaf0f5
Consistently use EXIT() in agent startup.
Review: https://reviews.apache.org/r/59506/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/999aaf0f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/999aaf0f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/999aaf0f
Branch: refs/heads/master
Commit: 999aaf0f5da1f0dbcb481f4c4867911760fc5ef4
Parents: 21caae3
Author: James Peach <jp...@apache.org>
Authored: Tue May 23 17:24:28 2017 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Tue May 23 17:24:28 2017 -0700
----------------------------------------------------------------------
src/slave/main.cpp | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/999aaf0f/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 47b5576..947f1f2 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -268,8 +268,7 @@ int main(int argc, char** argv)
// TODO(marco): this pattern too should be abstracted away
// in FlagsBase; I have seen it at least 15 times.
if (load.isError()) {
- cerr << flags.usage(load.error()) << endl;
- return EXIT_FAILURE;
+ EXIT(EXIT_FAILURE) << flags.usage(load.error());
}
// Check that agent's version has the expected format (SemVer).
@@ -283,15 +282,13 @@ int main(int argc, char** argv)
}
if (flags.master.isNone() && flags.master_detector.isNone()) {
- cerr << flags.usage("Missing required option `--master` or "
- "`--master_detector`.") << endl;
- return EXIT_FAILURE;
+ EXIT(EXIT_FAILURE) << flags.usage(
+ "Missing required option `--master` or `--master_detector`");
}
if (flags.master.isSome() && flags.master_detector.isSome()) {
- cerr << flags.usage("Only one of --master or --master_detector options "
- "should be specified.");
- return EXIT_FAILURE;
+ EXIT(EXIT_FAILURE) << flags.usage(
+ "Only one of `--master` or `--master_detector` should be specified");
}
// Initialize libprocess.
@@ -519,18 +516,16 @@ int main(int argc, char** argv)
ResourceEstimator::create(flags.resource_estimator);
if (resourceEstimator.isError()) {
- cerr << "Failed to create resource estimator: "
- << resourceEstimator.error() << endl;
- return EXIT_FAILURE;
+ EXIT(EXIT_FAILURE) << "Failed to create resource estimator: "
+ << resourceEstimator.error();
}
Try<QoSController*> qosController =
QoSController::create(flags.qos_controller);
if (qosController.isError()) {
- cerr << "Failed to create QoS Controller: "
- << qosController.error() << endl;
- return EXIT_FAILURE;
+ EXIT(EXIT_FAILURE) << "Failed to create QoS Controller: "
+ << qosController.error();
}
Slave* slave = new Slave(