diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-01-25 15:54:49 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-01-29 15:30:24 -0500 |
| commit | 77777c5624e2f5416d85500e82b7c80e10ed01b6 (patch) | |
| tree | b6f69a898835496e248bd1e5d551184e6bbf4b33 /src/rpc | |
| parent | d14ef5721ffcf07321704dc21f1ab9df4952a44d (diff) | |
| download | bitcoin-77777c5624e2f5416d85500e82b7c80e10ed01b6.tar.xz | |
log: Construct global logger on first use
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/misc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 18c867bff3..45d7ee017f 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -357,9 +357,9 @@ static void EnableOrDisableLogCategories(UniValue cats, bool enable) { bool success; if (enable) { - success = g_logger->EnableCategory(cat); + success = LogInstance().EnableCategory(cat); } else { - success = g_logger->DisableCategory(cat); + success = LogInstance().DisableCategory(cat); } if (!success) { @@ -405,14 +405,14 @@ UniValue logging(const JSONRPCRequest& request) ); } - uint32_t original_log_categories = g_logger->GetCategoryMask(); + uint32_t original_log_categories = LogInstance().GetCategoryMask(); if (request.params[0].isArray()) { EnableOrDisableLogCategories(request.params[0], true); } if (request.params[1].isArray()) { EnableOrDisableLogCategories(request.params[1], false); } - uint32_t updated_log_categories = g_logger->GetCategoryMask(); + uint32_t updated_log_categories = LogInstance().GetCategoryMask(); uint32_t changed_log_categories = original_log_categories ^ updated_log_categories; // Update libevent logging if BCLog::LIBEVENT has changed. @@ -421,8 +421,8 @@ UniValue logging(const JSONRPCRequest& request) // Throw an error if the user has explicitly asked to change only the libevent // flag and it failed. if (changed_log_categories & BCLog::LIBEVENT) { - if (!UpdateHTTPServerLogging(g_logger->WillLogCategory(BCLog::LIBEVENT))) { - g_logger->DisableCategory(BCLog::LIBEVENT); + if (!UpdateHTTPServerLogging(LogInstance().WillLogCategory(BCLog::LIBEVENT))) { + LogInstance().DisableCategory(BCLog::LIBEVENT); if (changed_log_categories == BCLog::LIBEVENT) { throw JSONRPCError(RPC_INVALID_PARAMETER, "libevent logging cannot be updated when using libevent before v2.1.1."); } |