git commit: Update the master and slave to not print stack traces for bad 'master' and 'zk' flags.

[bm...@apache.org]

Updated Branches:
  refs/heads/master fdbcf45da -> 82fd755f0


Update the master and slave to not print stack traces for bad
'master' and 'zk' flags.

From: Jiang Yan Xu <ya...@jxu.me>
Review: https://reviews.apache.org/r/15836


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

Branch: refs/heads/master
Commit: 82fd755f0863008fdcb1b1aba90ebc024efac7ae
Parents: fdbcf45
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Dec 2 10:48:05 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Mon Dec 2 10:53:57 2013 -0800

----------------------------------------------------------------------
 src/master/main.cpp | 11 ++++++++---
 src/slave/main.cpp  | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/82fd755f/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 60c86b3..b1e4576 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -124,7 +124,6 @@ int main(int argc, char** argv)
   logging::initialize(argv[0], flags, true); // Catch signals.
 
   LOG(INFO) << "Build: " << build::DATE << " by " << build::USER;
-  LOG(INFO) << "Starting Mesos master";
 
   allocator::AllocatorProcess* allocatorProcess =
     new allocator::HierarchicalDRFAllocatorProcess();
@@ -154,13 +153,19 @@ int main(int argc, char** argv)
   MasterDetector* detector;
 
   Try<MasterContender*> contender_ = MasterContender::create(zk);
-  CHECK_SOME(contender_) << "Failed to create a master contender";
+  if (contender_.isError()) {
+    EXIT(1) << "Failed to create a master contender: " << contender_.error();
+  }
   contender = contender_.get();
 
   Try<MasterDetector*> detector_ = MasterDetector::create(zk);
-  CHECK_SOME(detector_) << "Failed to create a master detector";
+  if (detector_.isError()) {
+    EXIT(1) << "Failed to create a master detector: " << detector_.error();
+  }
   detector = detector_.get();
 
+  LOG(INFO) << "Starting Mesos master";
+
   Master* master = new Master(
       allocator, registrar, &files, contender, detector, flags);
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/82fd755f/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 7a18494..e0cae7b 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -92,17 +92,16 @@ int main(int argc, char** argv)
   if (load.isError()) {
     cerr << load.error() << endl;
     usage(argv[0], flags);
-    exit(1);
+    EXIT(1);
   }
 
   if (help) {
     usage(argv[0], flags);
-    exit(1);
+    EXIT(1);
   }
 
   if (master.isNone()) {
-    cerr << "Missing required option --master" << endl;
-    exit(1);
+    EXIT(1) << "Missing required option --master";
   }
 
   // Initialize libprocess.
@@ -116,20 +115,21 @@ int main(int argc, char** argv)
 
   logging::initialize(argv[0], flags, true); // Catch signals.
 
+  LOG(INFO) << "Build: " << build::DATE << " by " << build::USER;
+
   LOG(INFO) << "Creating \"" << isolation << "\" isolator";
 
   Isolator* isolator = Isolator::create(isolation);
   if (isolator == NULL) {
-    cerr << "Unrecognized isolation type: " << isolation << endl;
-    exit(1);
+    EXIT(1) << "Unrecognized isolation type: " << isolation;
   }
 
-  LOG(INFO) << "Build: " << build::DATE << " by " << build::USER;
-  LOG(INFO) << "Starting Mesos slave";
-
   Try<MasterDetector*> detector = MasterDetector::create(master.get());
+  if (detector.isError()) {
+    EXIT(1) << "Failed to create a master detector: " << detector.error();
+  }
 
-  CHECK_SOME(detector) << "Failed to create a master detector";
+  LOG(INFO) << "Starting Mesos slave";
 
   Files files;
   Slave* slave = new Slave(flags, false,  detector.get(), isolator, &files);