From 8a6810d0d2759c69f63b53c48aa79e0cfdd88ffb Mon Sep 17 00:00:00 2001 From: darosior Date: Thu, 16 May 2019 23:01:00 +0200 Subject: [PATCH] Add a 'logpath' field to getrpcinfo --- src/rpc/server.cpp | 4 ++++ test/functional/interface_rpc.py | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 9df4070cbb..e9a373cb06 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -234,6 +234,10 @@ static UniValue getrpcinfo(const JSONRPCRequest& request) UniValue result(UniValue::VOBJ); result.pushKV("active_commands", active_commands); + const std::string path = LogInstance().m_file_path.string(); + UniValue log_path(UniValue::VSTR, path); + result.pushKV("logpath", log_path); + return result; } diff --git a/test/functional/interface_rpc.py b/test/functional/interface_rpc.py index 49ae0fb1a9..e99fa22646 100755 --- a/test/functional/interface_rpc.py +++ b/test/functional/interface_rpc.py @@ -4,6 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Tests some generic aspects of the RPC interface.""" +import os from test_framework.authproxy import JSONRPCException from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal, assert_greater_than_or_equal @@ -31,6 +32,7 @@ class RPCInterfaceTest(BitcoinTestFramework): command = info['active_commands'][0] assert_equal(command['method'], 'getrpcinfo') assert_greater_than_or_equal(command['duration'], 0) + assert_equal(info['logpath'], os.path.join(self.nodes[0].datadir, 'regtest', 'debug.log')) def test_batch_request(self): self.log.info("Testing basic JSON-RPC batch request...")