From 59fe88baf20651a2c0c0ab8818702e81ff2e0633 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 5 Jul 2021 12:14:21 +0800 Subject: [PATCH] common/Graylog: consolidate ctors * initialize member variables in-class * use delegate ctor to dedup the logic in two ctors. Signed-off-by: Kefu Chai --- src/common/Graylog.cc | 17 ++--------------- src/common/Graylog.h | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/common/Graylog.cc b/src/common/Graylog.cc index 3e9da5fe85a25..cbd63fab25fdc 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::create("json")); - m_formatter_section = std::unique_ptr(Formatter::create("json")); -} + : Graylog(nullptr, logger) +{} Graylog::~Graylog() { diff --git a/src/common/Graylog.h b/src/common/Graylog.h index a4214fa878927..c8c50131999d7 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; -- 2.39.5