From: Kefu Chai <kchai@redhat.com>
Date: Mon, 5 Jul 2021 04:14:21 +0000 (+0800)
Subject: common/Graylog: consolidate ctors
X-Git-Tag: v17.1.0~1463^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42175%2Fhead;p=ceph.git

common/Graylog: consolidate ctors

* initialize member variables in-class
* use delegate ctor to dedup the logic in two ctors.

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

diff --git a/src/common/Graylog.cc b/src/common/Graylog.cc
index 3e9da5fe85a..cbd63fab25f 100644
--- a/src/common/Graylog.cc
+++ b/src/common/Graylog.cc
@@ -13,9 +13,6 @@ namespace ceph::logging {
 
 Graylog::Graylog(const SubsystemMap * const s, const std::string &logger)
     : m_subs(s),
-      m_log_dst_valid(false),
-      m_hostname(""),
-      m_fsid(""),
       m_logger(std::move(logger)),
       m_ostream_compressed(std::stringstream::in |
                            std::stringstream::out |
@@ -26,18 +23,8 @@ Graylog::Graylog(const SubsystemMap * const s, const std::string &logger)
 }
 
 Graylog::Graylog(const std::string &logger)
-    : m_subs(NULL),
-      m_log_dst_valid(false),
-      m_hostname(""),
-      m_fsid(""),
-      m_logger(std::move(logger)),
-      m_ostream_compressed(std::stringstream::in |
-                           std::stringstream::out |
-                           std::stringstream::binary)
-{
-  m_formatter = std::unique_ptr<Formatter>(Formatter::create("json"));
-  m_formatter_section = std::unique_ptr<Formatter>(Formatter::create("json"));
-}
+  : Graylog(nullptr, logger)
+{}
 
 Graylog::~Graylog()
 {
diff --git a/src/common/Graylog.h b/src/common/Graylog.h
index a4214fa8789..c8c50131999 100644
--- a/src/common/Graylog.h
+++ b/src/common/Graylog.h
@@ -59,7 +59,7 @@ class Graylog
  private:
   SubsystemMap const * const m_subs;
 
-  bool m_log_dst_valid;
+  bool m_log_dst_valid = false;
 
   std::string m_hostname;
   std::string m_fsid;