Skip to content

Commit

Permalink
Added apply_logger_env_levels (#2649)
Browse files Browse the repository at this point in the history
This method applies levels which is set by environment variable
`SPDLOG_LEVEL` to the a single controller. Usefull for loading
configuration into manually created loggers.
  • Loading branch information
afshinpir committed Feb 25, 2023
1 parent 7372596 commit 51bcff8
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 0 deletions.
8 changes: 8 additions & 0 deletions include/spdlog/details/registry-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,14 @@ SPDLOG_INLINE registry &registry::instance()
return s_instance;
}

SPDLOG_INLINE void registry::apply_logger_env_levels(std::shared_ptr<logger> new_logger)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
auto it = log_levels_.find(new_logger->name());
auto new_level = it != log_levels_.end() ? it->second : global_log_level_;
new_logger->set_level(new_level);
}

SPDLOG_INLINE void registry::throw_if_exists_(const std::string &logger_name)
{
if (loggers_.find(logger_name) != loggers_.end())
Expand Down
2 changes: 2 additions & 0 deletions include/spdlog/details/registry.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ class SPDLOG_API registry

static registry &instance();

void apply_logger_env_levels(std::shared_ptr<logger> new_logger);

private:
registry();
~registry();
Expand Down
5 changes: 5 additions & 0 deletions include/spdlog/spdlog-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,9 @@ SPDLOG_INLINE void set_default_logger(std::shared_ptr<spdlog::logger> default_lo
details::registry::instance().set_default_logger(std::move(default_logger));
}

SPDLOG_INLINE void apply_logger_env_levels(std::shared_ptr<logger> logger)
{
details::registry::instance().apply_logger_env_levels(std::move(logger));
}

} // namespace spdlog
9 changes: 9 additions & 0 deletions include/spdlog/spdlog.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,15 @@ SPDLOG_API spdlog::logger *default_logger_raw();

SPDLOG_API void set_default_logger(std::shared_ptr<spdlog::logger> default_logger);

// Initialize logger level based on environment configs.
//
// Useful for applying SPDLOG_LEVEL to manually created loggers.
//
// Example:
// auto mylogger = std::make_shared<spdlog::logger>("mylogger", ...);
// spdlog::apply_logger_env_levels(mylogger);
SPDLOG_API void apply_logger_env_levels(std::shared_ptr<logger> logger);

template<typename... Args>
inline void log(source_loc source, level::level_enum lvl, format_string_t<Args...> fmt, Args &&... args)
{
Expand Down

0 comments on commit 51bcff8

Please sign in to comment.