Skip to content

Commit 27831fc

Browse files
committed
log level set to lowest sink level
avoids evaluating some trace arguments if not needed
1 parent 1cd7c79 commit 27831fc

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

src/LogSetup.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
void setup_logs(const CmdArgs& Args)
2525
{
26+
spdlog::init_thread_pool(4096, 1);
27+
2628
//these return level::off if no match
2729
auto file_level = spdlog::level::from_str(Args.FileLevel.getValue());
2830
auto console_level = spdlog::level::from_str(Args.ConsoleLevel.getValue());
@@ -41,9 +43,8 @@ void setup_logs(const CmdArgs& Args)
4143
const std::vector<spdlog::sink_ptr> sinks = {file,console};
4244

4345
//finally make our logger
44-
spdlog::init_thread_pool(4096, 1);
4546
auto log = std::make_shared<spdlog::async_logger>("MiniPlex", sinks.begin(), sinks.end(), spdlog::thread_pool(), spdlog::async_overflow_policy::overrun_oldest);
46-
log->set_level(spdlog::level::trace);
47+
log->set_level(file_level < console_level ? file_level : console_level);
4748
log->flush_on(spdlog::level::err);
4849
spdlog::register_logger(log);
4950
spdlog::flush_every(std::chrono::seconds(3));

src/ProtoConv/LogSetup.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
void setup_logs(const CmdArgs& Args)
2525
{
26+
spdlog::init_thread_pool(4096, 1);
27+
2628
//these return level::off if no match
2729
auto file_level = spdlog::level::from_str(Args.FileLevel.getValue());
2830
auto console_level = spdlog::level::from_str(Args.ConsoleLevel.getValue());
@@ -41,9 +43,8 @@ void setup_logs(const CmdArgs& Args)
4143
const std::vector<spdlog::sink_ptr> sinks = {file,console};
4244

4345
//finally make our logger
44-
spdlog::init_thread_pool(4096, 1);
4546
auto log = std::make_shared<spdlog::async_logger>("ProtoConv", sinks.begin(), sinks.end(), spdlog::thread_pool(), spdlog::async_overflow_policy::overrun_oldest);
46-
log->set_level(spdlog::level::trace);
47+
log->set_level(file_level < console_level ? file_level : console_level);
4748
log->flush_on(spdlog::level::err);
4849
spdlog::register_logger(log);
4950
spdlog::flush_every(std::chrono::seconds(3));

src/ProtoConv/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ try
6161
t.join();
6262

6363
spdlog::get("ProtoConv")->info("Shutdown cleanly: return 0.");
64+
spdlog::apply_all([](const std::shared_ptr<spdlog::logger>& l) {l->flush(); });
65+
spdlog::drop_all();
6466
spdlog::shutdown();
6567
return 0;
6668
}

src/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ try
6363
t.join();
6464

6565
spdlog::get("MiniPlex")->info("Shutdown cleanly: return 0.");
66+
spdlog::apply_all([](const std::shared_ptr<spdlog::logger>& l) {l->flush(); });
67+
spdlog::drop_all();
6668
spdlog::shutdown();
6769
return 0;
6870
}

0 commit comments

Comments
 (0)