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:09 UTC

[4/4] mesos git commit: Added a TODO about glog initialization in master and slave main().

Added a TODO about glog initialization in master and slave main().


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cbae0ce0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cbae0ce0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cbae0ce0

Branch: refs/heads/master
Commit: cbae0ce07f39db58ef466245d7d4ad5412136f6d
Parents: e1e10d5
Author: Alexander Rukletsov <al...@apache.org>
Authored: Wed Jun 7 15:55:37 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Jun 7 15:55:37 2017 +0200

----------------------------------------------------------------------
 src/master/main.cpp | 1 +
 src/slave/main.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/cbae0ce0/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 06c735e..1a78a55 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -252,6 +252,7 @@ int main(int argc, char** argv)
                        << "`main()` was not the function's first invocation";
   }
 
+  // TODO(alexr): This should happen before we start using glog, see MESOS-7586.
   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/cbae0ce0/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 80a957b..66ae7db 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -265,10 +265,9 @@ int main(int argc, char** argv)
     return EXIT_SUCCESS;
   }
 
-  // TODO(marco): this pattern too should be abstracted away
-  // in FlagsBase; I have seen it at least 15 times.
   if (load.isError()) {
-    EXIT(EXIT_FAILURE) << flags.usage(load.error());
+    cerr << flags.usage(load.error()) << endl;
+    return EXIT_FAILURE;
   }
 
   // Check that agent's version has the expected format (SemVer).
@@ -355,6 +354,7 @@ int main(int argc, char** argv)
                        << "`main()` was not the function's first invocation";
   }
 
+  // TODO(alexr): This should happen before we start using glog, see MESOS-7586.
   logging::initialize(argv[0], flags, true); // Catch signals.
 
   // Log any flag warnings (after logging is initialized).