mirror of
https://github.com/Milxnor/Project-Reboot-3.0.git
synced 2026-01-14 03:02:22 +01:00
update spdlog (it still dont work), fix 6.3(1)
This commit is contained in:
60
vendor/spdlog/sinks/dist_sink.h
vendored
60
vendor/spdlog/sinks/dist_sink.h
vendored
@@ -19,72 +19,56 @@
|
||||
namespace spdlog {
|
||||
namespace sinks {
|
||||
|
||||
template<typename Mutex>
|
||||
class dist_sink : public base_sink<Mutex>
|
||||
{
|
||||
template <typename Mutex>
|
||||
class dist_sink : public base_sink<Mutex> {
|
||||
public:
|
||||
dist_sink() = default;
|
||||
explicit dist_sink(std::vector<std::shared_ptr<sink>> sinks)
|
||||
: sinks_(sinks)
|
||||
{}
|
||||
: sinks_(sinks) {}
|
||||
|
||||
dist_sink(const dist_sink &) = delete;
|
||||
dist_sink &operator=(const dist_sink &) = delete;
|
||||
|
||||
void add_sink(std::shared_ptr<sink> sink)
|
||||
{
|
||||
void add_sink(std::shared_ptr<sink> sub_sink) {
|
||||
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
||||
sinks_.push_back(sink);
|
||||
sinks_.push_back(sub_sink);
|
||||
}
|
||||
|
||||
void remove_sink(std::shared_ptr<sink> sink)
|
||||
{
|
||||
void remove_sink(std::shared_ptr<sink> sub_sink) {
|
||||
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
||||
sinks_.erase(std::remove(sinks_.begin(), sinks_.end(), sink), sinks_.end());
|
||||
sinks_.erase(std::remove(sinks_.begin(), sinks_.end(), sub_sink), sinks_.end());
|
||||
}
|
||||
|
||||
void set_sinks(std::vector<std::shared_ptr<sink>> sinks)
|
||||
{
|
||||
void set_sinks(std::vector<std::shared_ptr<sink>> sinks) {
|
||||
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
||||
sinks_ = std::move(sinks);
|
||||
}
|
||||
|
||||
std::vector<std::shared_ptr<sink>> &sinks()
|
||||
{
|
||||
return sinks_;
|
||||
}
|
||||
std::vector<std::shared_ptr<sink>> &sinks() { return sinks_; }
|
||||
|
||||
protected:
|
||||
void sink_it_(const details::log_msg &msg) override
|
||||
{
|
||||
for (auto &sink : sinks_)
|
||||
{
|
||||
if (sink->should_log(msg.level))
|
||||
{
|
||||
sink->log(msg);
|
||||
void sink_it_(const details::log_msg &msg) override {
|
||||
for (auto &sub_sink : sinks_) {
|
||||
if (sub_sink->should_log(msg.level)) {
|
||||
sub_sink->log(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void flush_() override
|
||||
{
|
||||
for (auto &sink : sinks_)
|
||||
{
|
||||
sink->flush();
|
||||
void flush_() override {
|
||||
for (auto &sub_sink : sinks_) {
|
||||
sub_sink->flush();
|
||||
}
|
||||
}
|
||||
|
||||
void set_pattern_(const std::string &pattern) override
|
||||
{
|
||||
void set_pattern_(const std::string &pattern) override {
|
||||
set_formatter_(details::make_unique<spdlog::pattern_formatter>(pattern));
|
||||
}
|
||||
|
||||
void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override
|
||||
{
|
||||
void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override {
|
||||
base_sink<Mutex>::formatter_ = std::move(sink_formatter);
|
||||
for (auto &sink : sinks_)
|
||||
{
|
||||
sink->set_formatter(base_sink<Mutex>::formatter_->clone());
|
||||
for (auto &sub_sink : sinks_) {
|
||||
sub_sink->set_formatter(base_sink<Mutex>::formatter_->clone());
|
||||
}
|
||||
}
|
||||
std::vector<std::shared_ptr<sink>> sinks_;
|
||||
@@ -93,5 +77,5 @@ protected:
|
||||
using dist_sink_mt = dist_sink<std::mutex>;
|
||||
using dist_sink_st = dist_sink<details::null_mutex>;
|
||||
|
||||
} // namespace sinks
|
||||
} // namespace spdlog
|
||||
} // namespace sinks
|
||||
} // namespace spdlog
|
||||
|
||||
Reference in New Issue
Block a user