From 15545438d7c202c98271b42c63b4537dd7a67781 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 31 Jan 2008 14:43:18 -0800
Subject: [PATCH] some startup cleanup

---
 src/cmds.cc | 9 +++++++--
 src/cmon.cc | 9 +++++++--
 src/cosd.cc | 3 ++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/cmds.cc b/src/cmds.cc
index 4a30cf3eb5d08..a046f4f574396 100644
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -56,8 +56,13 @@ int main(int argc, const char **argv)
 
   // load monmap
   MonMap monmap;
-  int r = monmap.read(".ceph_monmap");
-  assert(r >= 0);
+  const char *monmap_fn = ".ceph_monmap";
+  int r = monmap.read(monmap_fn);
+  if (r < 0) {
+    cerr << "couldn't read monmap from " << monmap_fn
+	 << ": " << strerror(errno) << std::endl;
+    return -1;
+  }
 
   // start up network
   rank.bind();
diff --git a/src/cmon.cc b/src/cmon.cc
index 71f743ff578f9..04b8f026c2bbf 100644
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -72,7 +72,11 @@ int main(int argc, const char **argv)
     // write monmap
     cout << "writing monmap to " << monmap_fn << std::endl;;
     int r = monmap.write(monmap_fn);
-    assert(r >= 0);
+    if (r < 0) {
+      cerr << "couldn't write monmap to " << monmap_fn
+	   << ": " << strerror(errno) << std::endl;
+      return -1;
+    }
   } else {
     // i am specific monitor.
 
@@ -80,7 +84,8 @@ int main(int argc, const char **argv)
     //cout << "reading monmap from " << monmap_fn << std::endl;
     int r = monmap.read(monmap_fn);
     if (r < 0) {
-      cerr << "couldn't read monmap from " << monmap_fn << std::endl;
+      cerr << "couldn't read monmap from " << monmap_fn 
+	   << ": " << strerror(errno) << std::endl;
       return -1;
     }
 
diff --git a/src/cosd.cc b/src/cosd.cc
index d727d1a67901b..6b2d327d49500 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -87,7 +87,8 @@ int main(int argc, const char **argv)
   MonMap monmap;
   int r = monmap.read(monmap_fn);
   if (r < 0) {
-    cerr << "unable to read monmap from " << monmap_fn << std::endl;
+    cerr << "unable to read monmap from " << monmap_fn 
+	 << ": " << strerror(errno) << std::endl;
     return -1;
   }
 
-- 
2.39.5