From 099137fe9a052a18037ac6427f628220c8d5ce5c Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Sun, 25 Aug 2019 18:05:47 +0300
Subject: [PATCH] backtrace_sink code cleanup

---
 include/spdlog/logger-inl.h           | 18 ++++++++----------
 include/spdlog/logger.h               |  2 +-
 include/spdlog/sinks/backtrace-sink.h | 14 +++++++-------
 include/spdlog/sinks/dist_sink.h      |  3 +--
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/include/spdlog/logger-inl.h b/include/spdlog/logger-inl.h
index fd91a47d..ab8b5c59 100644
--- a/include/spdlog/logger-inl.h
+++ b/include/spdlog/logger-inl.h
@@ -25,13 +25,12 @@ SPDLOG_INLINE logger::logger(const logger &other)
     , backtrace_sink_(other.backtrace_sink_)
 {}
 
-SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT :
-    name_(std::move(other.name_)),
-    sinks_(std::move(other.sinks_)),
-    level_(other.level_.load(std::memory_order_relaxed)),
-    flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
-    custom_err_handler_(std::move(other.custom_err_handler_)),
-    backtrace_sink_(std::move(other.backtrace_sink_))
+SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)),
+                                                               sinks_(std::move(other.sinks_)),
+                                                               level_(other.level_.load(std::memory_order_relaxed)),
+                                                               flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
+                                                               custom_err_handler_(std::move(other.custom_err_handler_)),
+                                                               backtrace_sink_(std::move(other.backtrace_sink_))
 
 {}
 
@@ -88,7 +87,7 @@ SPDLOG_INLINE bool logger::should_log(level::level_enum msg_level) const
 
 SPDLOG_INLINE void logger::set_level(level::level_enum log_level)
 {
-    if(backtrace_sink_)
+    if (backtrace_sink_)
     {
         auto tracer = static_cast<sinks::backtrace_sink_mt *>(backtrace_sink_.get());
         tracer->set_filter_level(log_level);
@@ -139,8 +138,7 @@ SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages)
 {
     if (!backtrace_sink_)
     {
-        auto new_backtrace_sink = new spdlog::sinks::backtrace_sink_mt(level(), n_messages);
-        new_backtrace_sink->set_sinks(std::move(sinks_));
+        auto new_backtrace_sink = new spdlog::sinks::backtrace_sink_mt(std::move(sinks_), level(), n_messages);
         backtrace_sink_.reset(new_backtrace_sink);
         sinks().push_back(backtrace_sink_);
         assert(sinks().size() == 1);
diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h
index 96aed560..a17f9bfc 100644
--- a/include/spdlog/logger.h
+++ b/include/spdlog/logger.h
@@ -351,7 +351,7 @@ protected:
     spdlog::level_t flush_level_{level::off};
     err_handler custom_err_handler_{nullptr};
     sink_ptr backtrace_sink_;
-    //bool backtrace_enabled_{false};
+    // bool backtrace_enabled_{false};
 
     virtual void sink_it_(const details::log_msg &msg);
     virtual void flush_();
diff --git a/include/spdlog/sinks/backtrace-sink.h b/include/spdlog/sinks/backtrace-sink.h
index bb51e5a7..fe265ac5 100644
--- a/include/spdlog/sinks/backtrace-sink.h
+++ b/include/spdlog/sinks/backtrace-sink.h
@@ -5,7 +5,6 @@
 
 #include "dist_sink.h"
 #include "spdlog/common.h"
-#include "spdlog/details/null_mutex.h"
 #include "spdlog/details/log_msg_buffer.h"
 #include "spdlog/details/circular_q.h"
 
@@ -13,9 +12,9 @@
 #include <string>
 #include <chrono>
 
-// Store log messages in circular buffer
-// If it encounters a message with high enough level, it will send all previous message to it child sinks
-// Useful for storing debug data in case of error/warning happens
+// Store log messages in circular buffer.
+// If it encounters a message with high enough level, it will send all previous message to it child sinks.
+// Useful for storing debug data in case of error/warning happens.
 
 namespace spdlog {
 namespace sinks {
@@ -23,10 +22,12 @@ template<typename Mutex>
 class backtrace_sink : public dist_sink<Mutex>
 {
 public:
-    explicit backtrace_sink(spdlog::level::level_enum filter_level, size_t n_messages)
+    backtrace_sink(std::vector<std::shared_ptr<sink>> &&child_sinks, spdlog::level::level_enum filter_level, size_t n_messages)
         : filter_level_{filter_level}
         , traceback_msgs_{n_messages}
-    {}
+    {
+        dist_sink<Mutex>::set_sinks(std::move(child_sinks));
+    }
 
     void set_filter_level(spdlog::level::level_enum filter_level)
     {
@@ -83,7 +84,6 @@ protected:
 };
 
 using backtrace_sink_mt = backtrace_sink<std::mutex>;
-using backtrace_sink_st = backtrace_sink<details::null_mutex>;
 
 } // namespace sinks
 } // namespace spdlog
diff --git a/include/spdlog/sinks/dist_sink.h b/include/spdlog/sinks/dist_sink.h
index 00b908e1..8f931cf7 100644
--- a/include/spdlog/sinks/dist_sink.h
+++ b/include/spdlog/sinks/dist_sink.h
@@ -45,12 +45,11 @@ public:
         sinks_ = std::move(sinks);
     }
 
-    std::vector<std::shared_ptr<sink>>& sinks()
+    std::vector<std::shared_ptr<sink>> &sinks()
     {
         return sinks_;
     }
 
-
 protected:
     void sink_it_(const details::log_msg &msg) override
     {