Commit a0d7103d authored by Dominik Charousset's avatar Dominik Charousset

removed LOG_TRACE in `shutdown` function

the log trace re-created the logger as the trace helper goes out
of scope after the logging singleton was destroyed
parent 071dbe12
...@@ -69,11 +69,11 @@ class logging_impl : public logging { ...@@ -69,11 +69,11 @@ class logging_impl : public logging {
void initialize() { void initialize() {
m_thread = thread([this] { (*this)(); }); m_thread = thread([this] { (*this)(); });
log("TRACE ", "logging", "run", __FILE__, 31337, "ENTRY"); log("TRACE ", "logging", "run", __FILE__, __LINE__, "ENTRY");
} }
void destroy() { void destroy() {
log("TRACE ", "logging", "run", __FILE__, 31337, "EXIT"); log("TRACE ", "logging", "run", __FILE__, __LINE__, "EXIT");
// an empty string means: shut down // an empty string means: shut down
m_queue.push_back(new log_event{0, ""}); m_queue.push_back(new log_event{0, ""});
m_thread.join(); m_thread.join();
......
...@@ -67,8 +67,7 @@ std::atomic<logging*> s_logger; ...@@ -67,8 +67,7 @@ std::atomic<logging*> s_logger;
} // namespace <anonymous> } // namespace <anonymous>
void singleton_manager::shutdown() { void singleton_manager::shutdown() {
CPPA_LOGF_TRACE(""); CPPA_LOGF_INFO("prepare to shutdown");
CPPA_LOGF_DEBUG("prepare to shutdown");
if (self.unchecked() != nullptr) { if (self.unchecked() != nullptr) {
try { self.unchecked()->quit(exit_reason::normal); } try { self.unchecked()->quit(exit_reason::normal); }
catch (actor_exited&) { } catch (actor_exited&) { }
...@@ -78,7 +77,7 @@ void singleton_manager::shutdown() { ...@@ -78,7 +77,7 @@ void singleton_manager::shutdown() {
destroy(s_scheduler); destroy(s_scheduler);
destroy(s_middleman); destroy(s_middleman);
std::atomic_thread_fence(std::memory_order_seq_cst); std::atomic_thread_fence(std::memory_order_seq_cst);
// it's safe now to delete all other singletons now // it's safe to delete all other singletons now
destroy(s_actor_registry); destroy(s_actor_registry);
destroy(s_group_manager); destroy(s_group_manager);
destroy(s_empty_tuple); destroy(s_empty_tuple);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment