messenger: fix up fault()'s "onconnect" parameter.

We should be setting this true when calling fault() from connect().
And rename it in the header -- it does produce less output when set,
but it's actually useful because it changes the shutdown logic
slightly.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 2cfcad747f91ae058ecab316e0dbe12511858719..f1a60fc3c1f1ad335f9a94d468905d7a4942c8ee 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1315,7 +1315,7 @@ int SimpleMessenger::Pipe::connect()
   pipe_lock.Lock();
  fail_locked:
   if (state == STATE_CONNECTING)
-    fault();
+    fault(true);
   else
     ldout(msgr->cct,3) << "connect fault, but state != connecting, stopping" << dendl;
 

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 804494d63514357e26cea9477a660b2e62c70b7b..b2514f7885dea4015ef4eda052c295a2a8686ea5 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -174,7 +174,7 @@ private:
     int write_ack(uint64_t s);
     int write_keepalive();
 
-    void fault(bool silent=false, bool reader=false);
+    void fault(bool onconnect=false, bool reader=false);
     void fail();
 
     void was_session_reset();