monclient: be paranoid/defensive about send_log vs log_client==NULL

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 25b2ede161bd8595a7c08ea3cb2ed63f97c8ac67..4bdf9f2941535edd31f8bcd8b8405c78bae0387e 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -214,10 +214,12 @@ bool MonClient::ms_dispatch(Message *m)
 
 void MonClient::send_log()
 {
-  Message *lm = log_client->get_mon_log_message();
-  if (lm)
-    _send_mon_message(lm);
-  more_log_pending = log_client->are_pending();
+  if (log_client) {
+    Message *lm = log_client->get_mon_log_message();
+    if (lm)
+      _send_mon_message(lm);
+    more_log_pending = log_client->are_pending();
+  }
 }
 
 void MonClient::handle_monmap(MMonMap *m)
@@ -527,8 +529,7 @@ void MonClient::tick()
 
     messenger->send_keepalive(cur_con);
    
-    if (state == MC_STATE_HAVE_SESSION &&
-       log_client) {
+    if (state == MC_STATE_HAVE_SESSION) {
       send_log();
     }
   }