Commit 55716d22 authored by Jakob Otto's avatar Jakob Otto

Fix Asan issue

parent dccf46db
...@@ -56,14 +56,16 @@ void middleman::stop() { ...@@ -56,14 +56,16 @@ void middleman::stop() {
for (const auto& backend : backends_) for (const auto& backend : backends_)
backend->stop(); backend->stop();
mpx_->shutdown(); mpx_->shutdown();
if (mpx_thread_.joinable()) // TODO: Implement shutdown for multiplexer running in own thread!
mpx_thread_.join(); // if (mpx_thread_.joinable())
// mpx_thread_.join();
mpx_->run();
} }
void middleman::init(actor_system_config& cfg) { void middleman::init(actor_system_config& cfg) {
if (auto err = mpx_->init()) { if (auto err = mpx_->init()) {
CAF_LOG_ERROR("mgr->init() failed: " << system().render(err)); CAF_LOG_ERROR("mgr->init() failed: " << system().render(err));
CAF_RAISE_ERROR("mpx->init failed"); CAF_RAISE_ERROR("mpx->init() failed");
} }
if (auto node_uri = get_if<uri>(&cfg, "middleman.this-node")) { if (auto node_uri = get_if<uri>(&cfg, "middleman.this-node")) {
auto this_node = make_node_id(std::move(*node_uri)); auto this_node = make_node_id(std::move(*node_uri));
......
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