|
30 | 30 | namespace ipc { |
31 | 31 | namespace capnp { |
32 | 32 | namespace { |
33 | | -void IpcLogFn(bool raise, std::string message) |
| 33 | +void IpcLogFn(mp::LogMessage message) |
34 | 34 | { |
35 | | - LogDebug(BCLog::IPC, "%s\n", message); |
36 | | - if (raise) throw Exception(message); |
| 35 | + LogDebug(BCLog::IPC, "%s\n", message.message); |
| 36 | + if (message.level == mp::Log::Raise) throw Exception(message.message); |
37 | 37 | } |
38 | 38 |
|
39 | 39 | class CapnpProtocol : public Protocol |
@@ -62,7 +62,10 @@ class CapnpProtocol : public Protocol |
62 | 62 | { |
63 | 63 | assert(!m_loop); |
64 | 64 | mp::g_thread_context.thread_name = mp::ThreadName(exe_name); |
65 | | - m_loop.emplace(exe_name, &IpcLogFn, &m_context); |
| 65 | + mp::LogOptions opts = { |
| 66 | + .log_fn = IpcLogFn, |
| 67 | + }; |
| 68 | + m_loop.emplace(exe_name, std::move(opts), &m_context); |
66 | 69 | if (ready_fn) ready_fn(); |
67 | 70 | mp::ServeStream<messages::Init>(*m_loop, fd, init); |
68 | 71 | m_parent_connection = &m_loop->m_incoming_connections.back(); |
@@ -90,7 +93,10 @@ class CapnpProtocol : public Protocol |
90 | 93 | std::promise<void> promise; |
91 | 94 | m_loop_thread = std::thread([&] { |
92 | 95 | util::ThreadRename("capnp-loop"); |
93 | | - m_loop.emplace(exe_name, &IpcLogFn, &m_context); |
| 96 | + mp::LogOptions opts = { |
| 97 | + .log_fn = IpcLogFn, |
| 98 | + }; |
| 99 | + m_loop.emplace(exe_name, std::move(opts), &m_context); |
94 | 100 | m_loop_ref.emplace(*m_loop); |
95 | 101 | promise.set_value(); |
96 | 102 | m_loop->loop(); |
|
0 commit comments