Repository: mesos Updated Branches: refs/heads/1.2.x a8abde762 -> 12890ba05
Fixed flags logging in Docker executor. Review: https://reviews.apache.org/r/57889/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/12890ba0 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/12890ba0 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/12890ba0 Branch: refs/heads/1.2.x Commit: 12890ba05280e47728db654a4c3a57adb382a831 Parents: a8abde7 Author: Till Toenshoff <[email protected]> Authored: Thu Mar 23 21:37:18 2017 +0100 Committer: Till Toenshoff <[email protected]> Committed: Thu Mar 23 21:37:18 2017 +0100 ---------------------------------------------------------------------- src/docker/executor.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/12890ba0/src/docker/executor.cpp ---------------------------------------------------------------------- diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp index d8c72b0..6786687 100644 --- a/src/docker/executor.cpp +++ b/src/docker/executor.cpp @@ -684,8 +684,6 @@ int main(int argc, char** argv) return EXIT_FAILURE; } - std::cout << stringify(flags) << std::endl; - mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals. // Log any flag warnings (after logging is initialized). @@ -693,13 +691,13 @@ int main(int argc, char** argv) LOG(WARNING) << warning.message; } + VLOG(1) << stringify(flags); + if (flags.help) { cout << flags.usage() << endl; return EXIT_SUCCESS; } - std::cout << stringify(flags) << std::endl; - if (flags.docker.isNone()) { cerr << flags.usage("Missing required option --docker") << endl; return EXIT_FAILURE;
