multiprocess: update multiprocess EventLoop construction to use options
This uses the constructors recently added upstream.
This commit is contained in:
1 parent
d2987102dd
commit
9d068225ee
1 file changed
+11
-5
@@ -30,10 +30,10 @@
|
|||||||
namespace ipc {
|
namespace ipc {
|
||||||
namespace capnp {
|
namespace capnp {
|
||||||
namespace {
|
namespace {
|
||||||
void IpcLogFn(bool raise, std::string message)
|
void IpcLogFn(mp::LogMessage message)
|
||||||
{
|
{
|
||||||
LogDebug(BCLog::IPC, "%s\n", message);
|
LogDebug(BCLog::IPC, "%s\n", message.message);
|
||||||
if (raise) throw Exception(message);
|
if (message.level == mp::Log::Raise) throw Exception(message.message);
|
||||||
}
|
}
|
||||||
|
|
||||||
class CapnpProtocol : public Protocol
|
class CapnpProtocol : public Protocol
|
||||||
@@ -62,7 +62,10 @@ public:
|
|||||||
{
|
{
|
||||||
assert(!m_loop);
|
assert(!m_loop);
|
||||||
mp::g_thread_context.thread_name = mp::ThreadName(exe_name);
|
mp::g_thread_context.thread_name = mp::ThreadName(exe_name);
|
||||||
m_loop.emplace(exe_name, &IpcLogFn, &m_context);
|
mp::LogOptions opts = {
|
||||||
|
.log_fn = IpcLogFn,
|
||||||
|
};
|
||||||
|
m_loop.emplace(exe_name, std::move(opts), &m_context);
|
||||||
if (ready_fn) ready_fn();
|
if (ready_fn) ready_fn();
|
||||||
mp::ServeStream<messages::Init>(*m_loop, fd, init);
|
mp::ServeStream<messages::Init>(*m_loop, fd, init);
|
||||||
m_parent_connection = &m_loop->m_incoming_connections.back();
|
m_parent_connection = &m_loop->m_incoming_connections.back();
|
||||||
@@ -90,7 +93,10 @@ public:
|
|||||||
std::promise<void> promise;
|
std::promise<void> promise;
|
||||||
m_loop_thread = std::thread([&] {
|
m_loop_thread = std::thread([&] {
|
||||||
util::ThreadRename("capnp-loop");
|
util::ThreadRename("capnp-loop");
|
||||||
m_loop.emplace(exe_name, &IpcLogFn, &m_context);
|
mp::LogOptions opts = {
|
||||||
|
.log_fn = IpcLogFn,
|
||||||
|
};
|
||||||
|
m_loop.emplace(exe_name, std::move(opts), &m_context);
|
||||||
m_loop_ref.emplace(*m_loop);
|
m_loop_ref.emplace(*m_loop);
|
||||||
promise.set_value();
|
promise.set_value();
|
||||||
m_loop->loop();
|
m_loop->loop();
|
||||||
|
|||||||
Reference in new issue
Block a user