summaryrefslogtreecommitdiff
path: root/src/mon/AuthMonitor.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/mon/AuthMonitor.cc')
-rw-r--r--src/mon/AuthMonitor.cc29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 727c1c525a8..017aabcf96d 100644
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -12,33 +12,34 @@
*
*/
-#include <sstream>
-
-#include "AuthMonitor.h"
-#include "Monitor.h"
-#include "MonitorStore.h"
+#include "mon_types.h"
+#include "osd/osd_types.h"
-#include "messages/MMonCommand.h"
-#include "messages/MAuth.h"
-#include "messages/MAuthReply.h"
-#include "messages/MMonGlobalID.h"
+#include <sstream>
#include "include/str_list.h"
+#include "include/assert.h"
+#include "common/config.h"
#include "common/Timer.h"
-
#include "auth/AuthServiceHandler.h"
#include "auth/KeyRing.h"
+#include "global/global_context.h"
+#include "global/debug.h"
-#include "osd/osd_types.h"
+#include "messages/MMonCommand.h"
+#include "messages/MAuth.h"
+#include "messages/MAuthReply.h"
+#include "messages/MMonGlobalID.h"
-#include "common/config.h"
-#include "include/assert.h"
+#include "Monitor.h"
+#include "MonitorStore.h"
-#include "global/debug.h"
+#include "AuthMonitor.h"
#define dout_subsys ceph_subsys_mon
#undef dout_prefix
#define dout_prefix _prefix(_dout, mon, paxos->get_version())
+
static ostream& _prefix(std::ostream *_dout, Monitor *mon, version_t v) {
return *_dout << "mon." << mon->name << "@" << mon->rank
<< "(" << mon->get_state_name()