Commit 4e6f7996 authored by Dominik Charousset's avatar Dominik Charousset

Fix cleanup with middleman_detach_multiplexer

parent 3da5e8e7
...@@ -294,9 +294,14 @@ void middleman::stop() { ...@@ -294,9 +294,14 @@ void middleman::stop() {
} }
} }
}); });
backend_supervisor_.reset(); if (system_.config().middleman_detach_multiplexer) {
if (thread_.joinable()) backend_supervisor_.reset();
thread_.join(); if (thread_.joinable())
thread_.join();
} else {
while (backend().try_run_once())
; // nop
}
hooks_.clear(); hooks_.clear();
named_brokers_.clear(); named_brokers_.clear();
scoped_actor self{system(), true}; scoped_actor self{system(), true};
......
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