summaryrefslogtreecommitdiff
path: root/src/ceph_mon.cc
diff options
context:
space:
mode:
authorGreg Farnum <gregory.farnum@dreamhost.com>2012-03-01 18:48:46 -0800
committerGreg Farnum <gregory.farnum@dreamhost.com>2012-03-02 12:32:36 -0800
commit091b17601631046e092fc4fa3ce357a9d6b67250 (patch)
tree15e7f9f4d938c20e3cd8ec4fd07de92527af6b1b /src/ceph_mon.cc
parent26e48f4234c051edeeac6e7ba739f911d9454b9a (diff)
downloadceph-091b17601631046e092fc4fa3ce357a9d6b67250.tar.gz
msgr: make nonce a required part of the SimpleMessenger constructor.
With that, remove the set_nonce function and the gratuitous passing of nonce around through layers of functions. Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Diffstat (limited to 'src/ceph_mon.cc')
-rw-r--r--src/ceph_mon.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index c9e6d37cc7a..218650e9de9 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -368,7 +368,8 @@ int main(int argc, const char **argv)
// bind
int rank = monmap.get_rank(g_conf->name.get_id());
SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
- entity_name_t::MON(rank));
+ entity_name_t::MON(rank),
+ 0);
messenger->set_cluster_protocol(CEPH_MON_PROTOCOL);
messenger->set_default_send_priority(CEPH_MSG_PRIO_HIGH);