TeaSpeak
/
spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang-format

This commit is contained in:
gabime 2019-08-22 19:38:00 +03:00
parent 6b527a50dd
commit f1718fb5b3
4 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/spdlog/details/log_msg_buffer.h
View File

@ -17,17 +17,20 @@ struct log_msg_buffer : log_msg
fmt::basic_memory_buffer<char, 200> payload_buf; fmt::basic_memory_buffer<char, 200> payload_buf;
log_msg_buffer() = default; log_msg_buffer() = default;
log_msg_buffer(const log_msg &orig_msg): log_msg(orig_msg) log_msg_buffer(const log_msg &orig_msg)
: log_msg(orig_msg)
{ {
update_buffers(); update_buffers();
} }
log_msg_buffer(const log_msg_buffer& other):log_msg(other) log_msg_buffer(const log_msg_buffer &other)
: log_msg(other)
{ {
update_buffers(); update_buffers();
} }
log_msg_buffer(const log_msg_buffer&& other):log_msg(std::move(other)) log_msg_buffer(const log_msg_buffer &&other)
: log_msg(std::move(other))
{ {
update_buffers(); update_buffers();
} }
@ -58,5 +61,5 @@ struct log_msg_buffer : log_msg
} }
}; };
} } // namespace details
} } // namespace spdlog

5
include/spdlog/details/thread_pool.h
View File

@ -7,7 +7,6 @@
#include "spdlog/details/mpmc_blocking_q.h" #include "spdlog/details/mpmc_blocking_q.h"
#include "spdlog/details/os.h" #include "spdlog/details/os.h"
#include <chrono> #include <chrono>
#include <memory> #include <memory>
#include <thread> #include <thread>
@ -68,8 +67,7 @@ struct async_msg:log_msg_buffer
: log_msg_buffer(m) : log_msg_buffer(m)
, msg_type(the_type) , msg_type(the_type)
, worker_ptr(std::move(worker)) , worker_ptr(std::move(worker))
{ {}
}
async_msg(async_logger_ptr &&worker, async_msg_type the_type) async_msg(async_logger_ptr &&worker, async_msg_type the_type)
: log_msg_buffer() : log_msg_buffer()
@ -80,7 +78,6 @@ struct async_msg:log_msg_buffer
explicit async_msg(async_msg_type the_type) explicit async_msg(async_msg_type the_type)
: async_msg(nullptr, the_type) : async_msg(nullptr, the_type)
{} {}
}; };
class thread_pool class thread_pool

15
include/spdlog/sinks/backtrace-sink.h
View File

@ -34,7 +34,6 @@
// l.warn("This will trigger the log of all prev messages in the queue"); // l.warn("This will trigger the log of all prev messages in the queue");
// } // }
namespace spdlog { namespace spdlog {
namespace sinks { namespace sinks {
template<typename Mutex> template<typename Mutex>
@ -42,7 +41,8 @@ class backtrace_sink : public dist_sink<Mutex>
{ {
public: public:
explicit backtrace_sink(level::level_enum trigger_level = spdlog::level::warn, size_t n_messages = 32) explicit backtrace_sink(level::level_enum trigger_level = spdlog::level::warn, size_t n_messages = 32)
: trigger_level_{trigger_level}, traceback_msgs_{n_messages} : trigger_level_{trigger_level}
, traceback_msgs_{n_messages}
{} {}
protected: protected:
@ -75,19 +75,18 @@ protected:
return; return;
} }
dist_sink<Mutex>::sink_it_(details::log_msg{ dist_sink<Mutex>::sink_it_(
logger_name,level::info,"********************* [Backtrace Start] *********************"}); details::log_msg{logger_name, level::info, "********************* [Backtrace Start] *********************"});
do do
{ {
details::log_msg_buffer popped; details::log_msg_buffer popped;
traceback_msgs_.pop_front(popped); traceback_msgs_.pop_front(popped);
dist_sink<Mutex>::sink_it_(popped); dist_sink<Mutex>::sink_it_(popped);
} } while (!traceback_msgs_.empty());
while (!traceback_msgs_.empty());
dist_sink<Mutex>::sink_it_(details::log_msg{ dist_sink<Mutex>::sink_it_(
logger_name,level::info,"********************* [Backtrace End] ***********************"}); details::log_msg{logger_name, level::info, "********************* [Backtrace End] ***********************"});
} }
}; };

1
include/spdlog/sinks/daily_file_sink.h
View File

@ -11,7 +11,6 @@
#include "spdlog/details/os.h" #include "spdlog/details/os.h"
#include "spdlog/details/synchronous_factory.h" #include "spdlog/details/synchronous_factory.h"
#include <chrono> #include <chrono>
#include <cstdio> #include <cstdio>
#include <ctime> #include <ctime>