]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
config: temporary fix for monclient conf issue
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 29 Mar 2011 21:53:10 +0000 (14:53 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 29 Mar 2011 21:53:34 +0000 (14:53 -0700)
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
src/mon/MonClient.cc

index 189207d50ce75cc015f9fd8d8e70dc55f2acc9a9..cb30c25c941c09386676237d4672046e343cb579 100644 (file)
@@ -54,7 +54,7 @@ int MonClient::build_initial_monmap()
   dout(10) << "build_initial_monmap" << dendl;
 
   // file?
-  if (g_conf.monmap) {
+  if (g_conf.monmap && g_conf.monmap[0]) {
     const char *monmap_fn = g_conf.monmap;
     int r;
     try {
@@ -71,7 +71,7 @@ int MonClient::build_initial_monmap()
   }
 
   // -m foo?
-  if (g_conf.mon_host) {
+  if (g_conf.mon_host && g_conf.mon_host[0]) {
     vector<entity_addr_t> addrs;
     if (parse_ip_port_vec(g_conf.mon_host, addrs)) {
       for (unsigned i=0; i<addrs.size(); i++) {