factory changes
This commit is contained in:
		@@ -5,9 +5,9 @@
 | 
			
		||||
#include <memory>
 | 
			
		||||
#include <mutex>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
namespace c11log
 | 
			
		||||
{
 | 
			
		||||
class logger;
 | 
			
		||||
namespace details
 | 
			
		||||
{
 | 
			
		||||
class factory
 | 
			
		||||
@@ -15,47 +15,46 @@ class factory
 | 
			
		||||
public:
 | 
			
		||||
    using logger_ptr = std::shared_ptr<c11log::logger>;
 | 
			
		||||
    using logger_map = std::unordered_map<std::string, logger_ptr>;
 | 
			
		||||
    void add_logger(const std::string& name, logger_ptr);
 | 
			
		||||
    std::shared_ptr<logger> create_logger(const std::string& name, logger::sinks_init_list, logger::formatter_ptr = nullptr);
 | 
			
		||||
    logger_ptr get_logger(const std::string &name);
 | 
			
		||||
    static c11log::details::factory& instance();
 | 
			
		||||
    static factory& instance();
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    std::mutex _loggers_mutex;
 | 
			
		||||
    logger_map _loggers;
 | 
			
		||||
    std::mutex _factory_mutex;
 | 
			
		||||
    logger_map _factory;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline void c11log::details::factory::add_logger(const std::string& name, logger_ptr logger_p)
 | 
			
		||||
inline std::shared_ptr<c11log::logger> c11log::details::factory::create_logger(const std::string& name, logger::sinks_init_list sinks, logger::formatter_ptr formatter)
 | 
			
		||||
{
 | 
			
		||||
    std::lock_guard<std::mutex> lock(_loggers_mutex);
 | 
			
		||||
    _loggers.insert(logger_map::value_type(name, logger_p));
 | 
			
		||||
    std::lock_guard<std::mutex> lock(_factory_mutex);
 | 
			
		||||
    logger_ptr logger_p = std::make_shared<logger>(name, sinks, std::move(formatter));
 | 
			
		||||
 | 
			
		||||
    _factory.insert(logger_map::value_type(name, logger_p));
 | 
			
		||||
    return logger_p;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline c11log::details::factory::logger_ptr c11log::details::factory::get_logger(const std::string &name)
 | 
			
		||||
{
 | 
			
		||||
    std::lock_guard<std::mutex> lock(_loggers_mutex);
 | 
			
		||||
    std::lock_guard<std::mutex> lock(_factory_mutex);
 | 
			
		||||
 | 
			
		||||
    auto found = _loggers.find(name);
 | 
			
		||||
    if (found != _loggers.end())
 | 
			
		||||
    auto found = _factory.find(name);
 | 
			
		||||
    if (found != _factory.end())
 | 
			
		||||
        return found->second;
 | 
			
		||||
    else
 | 
			
		||||
        return logger_ptr(nullptr);
 | 
			
		||||
    /*
 | 
			
		||||
    auto found = _loggers.find(name);
 | 
			
		||||
 | 
			
		||||
    if (found == _loggers.end()) {
 | 
			
		||||
        auto new_logger_ptr = std::make_shared<c11log::logger>(name);
 | 
			
		||||
        _loggers.insert(std::make_pair(name, new_logger_ptr));
 | 
			
		||||
        return new_logger_ptr;
 | 
			
		||||
    } else {
 | 
			
		||||
        return found->second;
 | 
			
		||||
    }*/
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
inline c11log::details::factory & c11log::details::factory::instance()
 | 
			
		||||
{
 | 
			
		||||
    static c11log::details::factory instance;
 | 
			
		||||
    static factory instance;
 | 
			
		||||
    return instance;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user