TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-15 23:35:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve test_logger

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-08-27 16:21:57 +02:00
parent 8632ad91e9
commit cbbb16e7dc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/test_logger.h
View File

@ -52,8 +52,10 @@ class test_logger : public ::dwarfs::logger {
test_logger(std::optional<level_type> threshold = std::nullopt) test_logger(std::optional<level_type> threshold = std::nullopt)
: threshold_{threshold ? *threshold : default_threshold()} : threshold_{threshold ? *threshold : default_threshold()}
, output_threshold_{output_threshold(default_threshold())}
, output_{::dwarfs::getenv_is_enabled("DWARFS_TEST_LOGGER_OUTPUT")} { , output_{::dwarfs::getenv_is_enabled("DWARFS_TEST_LOGGER_OUTPUT")} {
if (output_ || threshold > level_type::INFO) { if (threshold_ >= level_type::DEBUG ||
(output_ && output_threshold_ > level_type::DEBUG)) {
set_policy<debug_logger_policy>(); set_policy<debug_logger_policy>();
} else { } else {
set_policy<prod_logger_policy>(); set_policy<prod_logger_policy>();
@ -62,7 +64,7 @@ class test_logger : public ::dwarfs::logger {
void write(level_type level, std::string const& output, char const* file, void write(level_type level, std::string const& output, char const* file,
int line) override { int line) override {
if (output_) { if (output_ && level <= output_threshold_) {
std::lock_guard lock(mx_); std::lock_guard lock(mx_);
std::cerr << level_char(level) << " [" << file << ":" << line << "] " std::cerr << level_char(level) << " [" << file << ":" << line << "] "
<< output << "\n"; << output << "\n";
@ -81,16 +83,19 @@ class test_logger : public ::dwarfs::logger {
void clear() { log_.clear(); } void clear() { log_.clear(); }
private: private:
static level_type default_threshold() { static level_type default_threshold() { return level_type::INFO; }
static level_type output_threshold(level_type default_level) {
if (auto var = std::getenv("DWARFS_TEST_LOGGER_LEVEL")) { if (auto var = std::getenv("DWARFS_TEST_LOGGER_LEVEL")) {
return ::dwarfs::logger::parse_level(var); return ::dwarfs::logger::parse_level(var);
} }
return level_type::INFO; return default_level;
} }
std::mutex mx_; std::mutex mx_;
std::vector<log_entry> log_; std::vector<log_entry> log_;
level_type const threshold_; level_type const threshold_;
level_type const output_threshold_;
bool const output_; bool const output_;
}; };