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/06/07 14:00:08 UTC
[3/4] mesos git commit: Reordered flags help and error checks for
consistency in executors.
Reordered flags help and error checks for consistency in executors.
We are inconsistent throughout our code base about what should happen
first: check for `--help` or check for errors. This patch makes the
behaviour consistent for major binaries: master, slave, built-in
executors. A general clean-up is addressed in MESOS-7586.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e1e10d55
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e1e10d55
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e1e10d55
Branch: refs/heads/master
Commit: e1e10d55ff654050ea5628d0f3e6f8b398304958
Parents: cf71c5e
Author: Alexander Rukletsov <al...@apache.org>
Authored: Wed Jun 7 15:54:12 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Jun 7 15:54:12 2017 +0200
----------------------------------------------------------------------
src/docker/executor.cpp | 10 +++++-----
src/launcher/executor.cpp | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e1e10d55/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 82b4c87..e03f244 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -730,16 +730,16 @@ int main(int argc, char** argv)
// Load flags from environment and command line.
Try<flags::Warnings> load = flags.load(None(), &argc, &argv);
- if (load.isError()) {
- cerr << flags.usage(load.error()) << endl;
- return EXIT_FAILURE;
- }
-
if (flags.help) {
cout << flags.usage() << endl;
return EXIT_SUCCESS;
}
+ if (load.isError()) {
+ cerr << flags.usage(load.error()) << endl;
+ return EXIT_FAILURE;
+ }
+
mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
// Log any flag warnings (after logging is initialized).
http://git-wip-us.apache.org/repos/asf/mesos/blob/e1e10d55/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index f5a46b5..a620678 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -1202,16 +1202,16 @@ int main(int argc, char** argv)
// Load flags from command line.
Try<flags::Warnings> load = flags.load(None(), &argc, &argv);
- if (load.isError()) {
- cerr << flags.usage(load.error()) << endl;
- return EXIT_FAILURE;
- }
-
if (flags.help) {
cout << flags.usage() << endl;
return EXIT_SUCCESS;
}
+ if (load.isError()) {
+ cerr << flags.usage(load.error()) << endl;
+ return EXIT_FAILURE;
+ }
+
mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
// Log any flag warnings (after logging is initialized).