cosd: move messenger existence checks to where they're useful

diff --git a/src/cosd.cc b/src/cosd.cc
index fcb9c7ff2359cdaadd78e4365766ac412ac6926d..918c1c0f8c29b0de771fdf63d24bfac9b7380c9a 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -205,6 +205,9 @@ int main(int argc, const char **argv)
   SimpleMessenger *cluster_messenger = client_messenger;
   SimpleMessenger *messenger_hb = new SimpleMessenger();
 
+  if (!client_messenger || !messenger_hb)
+    return 1;
+
   entity_addr_t hb_addr;
 
   if (client_addr_set) {
@@ -216,6 +219,8 @@ int main(int argc, const char **argv)
 
   if (cluster_addr_set) {
     cluster_messenger = new SimpleMessenger();
+    if (!cluster_messenger)
+      return 1;
     cluster_messenger->bind(g_cluster_addr);
     hb_addr = g_cluster_addr;
     hb_addr.set_port(0);
@@ -230,11 +235,7 @@ int main(int argc, const char **argv)
        << std::endl;
 
   client_messenger->register_entity(entity_name_t::OSD(whoami));
-  if (!client_messenger)
-    return 1;
   messenger_hb->register_entity(entity_name_t::OSD(whoami));
-  if (!messenger_hb)
-    return 1;
 
   Throttle client_throttler(g_conf.osd_client_message_size_cap);