mirror of https://github.com/oxen-io/oxen-mq.git
Allow null logger
Currently if you pass a nullptr for Logger you get a random std::bad_function_call called from some random thread the first time a log message goes out. This fixes it allow a nullptr that logs nothing.
This commit is contained in:
parent
e382373f2e
commit
e180187746
|
@ -796,7 +796,7 @@ public:
|
||||||
std::string privkey,
|
std::string privkey,
|
||||||
bool service_node,
|
bool service_node,
|
||||||
SNRemoteAddress sn_lookup,
|
SNRemoteAddress sn_lookup,
|
||||||
Logger logger = [](LogLevel, const char*, int, std::string) { },
|
Logger logger = nullptr,
|
||||||
LogLevel level = LogLevel::warn);
|
LogLevel level = LogLevel::warn);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -805,7 +805,7 @@ public:
|
||||||
* new connections (including reconnections) to service nodes by pubkey.
|
* new connections (including reconnections) to service nodes by pubkey.
|
||||||
*/
|
*/
|
||||||
explicit OxenMQ(
|
explicit OxenMQ(
|
||||||
Logger logger = [](LogLevel, const char*, int, std::string) { },
|
Logger logger = nullptr,
|
||||||
LogLevel level = LogLevel::warn)
|
LogLevel level = LogLevel::warn)
|
||||||
: OxenMQ("", "", false, [](auto) { return ""s; /*no peer lookups*/ }, std::move(logger), level) {}
|
: OxenMQ("", "", false, [](auto) { return ""s; /*no peer lookups*/ }, std::move(logger), level) {}
|
||||||
|
|
||||||
|
@ -1779,7 +1779,7 @@ inline std::string_view trim_log_filename(std::string_view local_file) {
|
||||||
|
|
||||||
template <typename... T>
|
template <typename... T>
|
||||||
void OxenMQ::log(LogLevel lvl, const char* file, int line, const T&... stuff) {
|
void OxenMQ::log(LogLevel lvl, const char* file, int line, const T&... stuff) {
|
||||||
if (log_level() < lvl)
|
if (log_level() < lvl || !logger)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
std::ostringstream os;
|
std::ostringstream os;
|
||||||
|
|
Loading…
Reference in New Issue