update sources to v12.1.0

[ceph.git] / ceph / src / common / LogClient.cc

diff --git a/ceph/src/common/LogClient.cc b/ceph/src/common/LogClient.cc
index b99a8a2462cc7debdd14c90f85cc85be8ab34b80..07c53e80d9ff7201c4af5b52381fc7cadef1e76d 100644 (file)
--- a/ceph/src/common/LogClient.cc
+++ b/ceph/src/common/LogClient.cc
@@ -12,36 +12,18 @@
  * 
  */
 
-
-
-#include "include/types.h"
+#include "common/LogClient.h"
 #include "include/str_map.h"
-#include "include/uuid.h"
-
-#include "msg/Messenger.h"
-#include "msg/Message.h"
-
 #include "messages/MLog.h"
 #include "messages/MLogAck.h"
 #include "mon/MonMap.h"
-
-#include <iostream>
-#include <errno.h>
-#include <sys/stat.h>
-#include <syslog.h>
+#include "common/Graylog.h"
 
 #ifdef DARWIN
 #include <sys/param.h>
 #include <sys/mount.h>
 #endif // DARWIN
 
-#include "common/Graylog.h"
-// wipe the assert() introduced by boost headers included by Graylog.h
-#include "include/assert.h"
-#include "common/LogClient.h"
-
-#include "common/config.h"
-
 #define dout_subsys ceph_subsys_monc
 
 int parse_log_client_options(CephContext *cct,
@@ -241,6 +223,7 @@ void LogChannel::do_log(clog_type prio, const std::string& s)
   e.stamp = ceph_clock_now();
   // seq and who should be set for syslog/graylog/log_to_mon
   e.who = parent->get_myinst();
+  e.name = parent->get_myname();
   e.seq = parent->get_next_seq();
   e.prio = prio;
   e.msg = s;
@@ -360,6 +343,11 @@ const entity_inst_t& LogClient::get_myinst()
   return messenger->get_myinst();
 }
 
+const EntityName& LogClient::get_myname()
+{
+  return cct->_conf->name;
+}
+
 bool LogClient::handle_log_ack(MLogAck *m)
 {
   Mutex::Locker l(log_lock);