diff --git a/include/spdlog/sinks/ansicolor_sink-inl.h b/include/spdlog/sinks/ansicolor_sink-inl.h index 8fd3078a..bac65e7f 100644 --- a/include/spdlog/sinks/ansicolor_sink-inl.h +++ b/include/spdlog/sinks/ansicolor_sink-inl.h @@ -20,7 +20,7 @@ SPDLOG_INLINE ansicolor_sink::ansicolor_sink(FILE *target_file, co formatter_(details::make_unique()) { - set_color_mode(mode); + set_color_mode_(mode); colors_.at(level::trace) = to_string_(white); colors_.at(level::debug) = to_string_(cyan); colors_.at(level::info) = to_string_(green); @@ -82,12 +82,18 @@ SPDLOG_INLINE void ansicolor_sink::set_formatter( } template -SPDLOG_INLINE bool ansicolor_sink::should_color() { +SPDLOG_INLINE bool ansicolor_sink::should_color() const { return should_do_colors_; } template SPDLOG_INLINE void ansicolor_sink::set_color_mode(color_mode mode) { + std::lock_guard lock(mutex_); + set_color_mode_(mode); +} + +template +SPDLOG_INLINE void ansicolor_sink::set_color_mode_(color_mode mode) { switch (mode) { case color_mode::always: should_do_colors_ = true; @@ -105,14 +111,14 @@ SPDLOG_INLINE void ansicolor_sink::set_color_mode(color_mode mode) } template -SPDLOG_INLINE void ansicolor_sink::print_ccode_(const string_view_t &color_code) { +SPDLOG_INLINE void ansicolor_sink::print_ccode_(const string_view_t &color_code) const { details::os::fwrite_bytes(color_code.data(), color_code.size(), target_file_); } template SPDLOG_INLINE void ansicolor_sink::print_range_(const memory_buf_t &formatted, size_t start, - size_t end) { + size_t end) const { details::os::fwrite_bytes(formatted.data() + start, end - start, target_file_); } diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h index d0dadd75..19aa421e 100644 --- a/include/spdlog/sinks/ansicolor_sink.h +++ b/include/spdlog/sinks/ansicolor_sink.h @@ -36,7 +36,7 @@ public: void set_color(level::level_enum color_level, string_view_t color); void set_color_mode(color_mode mode); - bool should_color(); + bool should_color() const; void log(const details::log_msg &msg) override; void flush() override; @@ -84,8 +84,9 @@ private: bool should_do_colors_; std::unique_ptr formatter_; std::array colors_; - void print_ccode_(const string_view_t &color_code); - void print_range_(const memory_buf_t &formatted, size_t start, size_t end); + void set_color_mode_(color_mode mode); + void print_ccode_(const string_view_t &color_code) const; + void print_range_(const memory_buf_t &formatted, size_t start, size_t end) const; static std::string to_string_(const string_view_t &sv); };