diff options
| author | fanquake <fanquake@gmail.com> | 2019-09-10 10:16:07 +1000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-09-10 10:39:19 +1000 |
| commit | d8fe24cbfb72b58e6295befb4f52e0f140ca60e9 (patch) | |
| tree | 5daea1cc56543afc8a371c491fb0cb94db878d8e /src/rpc | |
| parent | 335b34c30ca93c648b239636168e07e48b5fdbeb (diff) | |
| parent | e90478f43e7bf9726ba033fde4a2776f9d5a9af4 (diff) | |
Merge #16489: log: harmonize bitcoind logging
e90478f43e7bf9726ba033fde4a2776f9d5a9af4 log: harmonize bitcoind server logging (Jon Atack)
Pull request description:
Harmonize the user-facing output of the `bitcoind -daemon`, `bitcoin-cli help stop`, `bitcoin-cli stop`, and `bitcoind -version` commands to be consistent with each other as well as with the "Bitcoin Core is probably already running" messages, e.g. `git grep 'probably already running.")'`.
Before:
```
$ bitcoind -regtest -daemon
Bitcoin Core daemon starting
$ bitcoind -regtest -daemon
Error: Bitcoin Core is probably already running.
$ bitcoind -regtest -version
Bitcoin Core Daemon version v0.18.99.0-e653eeff76-dirty
$ bitcoin-cli -regtest help stop
stop
Stop Bitcoin server.
$ bitcoin-cli -regtest stop
Bitcoin server stopping
```
these five commands output:
"Bitcoin Core daemon"
"Bitcoin Core"
"Bitcoin Core Daemon"
"Bitcoin server"
"Bitcoin server"
After this commit, they are all "Bitcoin Core".
```
$ bitcoind -regtest -daemon
Bitcoin Core starting
$ bitcoind -regtest -daemon
Error: Bitcoin Core is probably already running.
$ bitcoind -regtest -version
Bitcoin Core version v0.18.99.0-e90478f43e-dirty
$ bitcoin-cli -regtest help stop
stop
Request a graceful shutdown of Bitcoin Core.
$ bitcoin-cli -regtest stop
Bitcoin Core stopping
```
ACKs for top commit:
practicalswift:
ACK e90478f43e7bf9726ba033fde4a2776f9d5a9af4 (read code which looks good)
practicalswift:
ACK e90478f43e7bf9726ba033fde4a2776f9d5a9af4 -- diff looks correct
fjahr:
utACK e90478f
michaelfolkson:
ACK e90478f43e7bf9726ba033fde4a2776f9d5a9af4. Tested command outputs and as described.
ariard:
Tested ACK e90478f
fanquake:
ACK e90478f43e7bf9726ba033fde4a2776f9d5a9af4
Tree-SHA512: 9ee584d260b5c224463318a51c2856a7c0e463be039fea072e5d5bab8898f0043b3930cf887a47aafd0f3447adb551b5e47a4e98ebdefc6cdb8e77edde0347b0
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 18f7426bcf..3e5bb85c1c 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -162,7 +162,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest) if (jsonRequest.fHelp || jsonRequest.params.size() > 1) throw std::runtime_error( RPCHelpMan{"stop", - "\nStop Bitcoin server.", + "\nRequest a graceful shutdown of " PACKAGE_NAME ".", {}, RPCResults{}, RPCExamples{""}, @@ -173,7 +173,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest) if (jsonRequest.params[0].isNum()) { MilliSleep(jsonRequest.params[0].get_int()); } - return "Bitcoin server stopping"; + return PACKAGE_NAME " stopping"; } static UniValue uptime(const JSONRPCRequest& jsonRequest) |