Repository: mesos Updated Branches: refs/heads/1.1.x 9bc466ec5 -> 2f910790f
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/2f910790 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2f910790 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2f910790 Branch: refs/heads/1.1.x Commit: 2f910790f60cde698a1c3a08296d830acad0562a Parents: 9bc466e Author: Till Toenshoff <[email protected]> Authored: Mon Apr 10 23:57:19 2017 +0200 Committer: Till Toenshoff <[email protected]> Committed: Mon Apr 10 23:57:19 2017 +0200 ---------------------------------------------------------------------- src/docker/executor.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/2f910790/src/docker/executor.cpp ---------------------------------------------------------------------- diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp index 1428590..3eea3e8 100644 --- a/src/docker/executor.cpp +++ b/src/docker/executor.cpp @@ -688,8 +688,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). @@ -697,13 +695,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;
