From: Kefu Chai <kchai@redhat.com>
Date: Sat, 28 Nov 2020 13:35:10 +0000 (+0800)
Subject: mon/ConfigKeyService: drop ConfigKeyService::get_name()
X-Git-Tag: v16.1.0~361^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1ea1ae53fabf8600a224a001d86dbf4507cc522;p=ceph.git

mon/ConfigKeyService: drop ConfigKeyService::get_name()

the only caller of this function is prefix(), so hardcode the service
name there instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc
index 3e713833edf9..be3f6bd16c7c 100644
--- a/src/mon/ConfigKeyService.cc
+++ b/src/mon/ConfigKeyService.cc
@@ -62,7 +62,7 @@ static ostream& _prefix(std::ostream *_dout, const Monitor &mon,
                         const ConfigKeyService *service)
 {
   return *_dout << "mon." << mon.name << "@" << mon.rank
-		<< "(" << mon.get_state_name() << ")." << service->get_name();
+		<< "(" << mon.get_state_name() << ").config_key";
 }
 
 const string CONFIG_PREFIX = "mon_config_key";
diff --git a/src/mon/ConfigKeyService.h b/src/mon/ConfigKeyService.h
index 412ae424f0dc..8205ebaf1ec0 100644
--- a/src/mon/ConfigKeyService.h
+++ b/src/mon/ConfigKeyService.h
@@ -38,9 +38,6 @@ public:
       std::stringstream& ss);
   void do_osd_new(const uuid_d& uuid, const std::string& dmcrypt_key);
 
-  std::string get_name() const {
-    return "config_key";
-  }
   void get_store_prefixes(std::set<std::string>& s) const;
 
 private: