Skip to content

Commit d8fe24c

Browse files
committed
Merge #16489: log: harmonize bitcoind logging
e90478f 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 e90478f (read code which looks good) practicalswift: ACK e90478f -- diff looks correct fjahr: utACK e90478f michaelfolkson: ACK e90478f. Tested command outputs and as described. ariard: Tested ACK e90478f fanquake: ACK e90478f Tree-SHA512: 9ee584d260b5c224463318a51c2856a7c0e463be039fea072e5d5bab8898f0043b3930cf887a47aafd0f3447adb551b5e47a4e98ebdefc6cdb8e77edde0347b0
2 parents 335b34c + e90478f commit d8fe24c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/bitcoind.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
2-
// Copyright (c) 2009-2018 The Bitcoin Core developers
2+
// Copyright (c) 2009-2019 The Bitcoin Core developers
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

@@ -77,15 +77,15 @@ static bool AppInit(int argc, char* argv[])
7777

7878
// Process help and version before taking care about datadir
7979
if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
80-
std::string strUsage = PACKAGE_NAME " Daemon version " + FormatFullVersion() + "\n";
80+
std::string strUsage = PACKAGE_NAME " version " + FormatFullVersion() + "\n";
8181

8282
if (gArgs.IsArgSet("-version"))
8383
{
8484
strUsage += FormatParagraph(LicenseInfo()) + "\n";
8585
}
8686
else
8787
{
88-
strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME " Daemon\n";
88+
strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n";
8989
strUsage += "\n" + gArgs.GetHelpMessage();
9090
}
9191

@@ -142,7 +142,7 @@ static bool AppInit(int argc, char* argv[])
142142
#pragma GCC diagnostic push
143143
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
144144
#endif
145-
tfm::format(std::cout, PACKAGE_NAME " daemon starting\n");
145+
tfm::format(std::cout, PACKAGE_NAME " starting\n");
146146

147147
// Daemonize
148148
if (daemon(1, 0)) { // don't chdir (1), do close FDs (0)

src/rpc/server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
162162
if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
163163
throw std::runtime_error(
164164
RPCHelpMan{"stop",
165-
"\nStop Bitcoin server.",
165+
"\nRequest a graceful shutdown of " PACKAGE_NAME ".",
166166
{},
167167
RPCResults{},
168168
RPCExamples{""},
@@ -173,7 +173,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
173173
if (jsonRequest.params[0].isNum()) {
174174
MilliSleep(jsonRequest.params[0].get_int());
175175
}
176-
return "Bitcoin server stopping";
176+
return PACKAGE_NAME " stopping";
177177
}
178178

179179
static UniValue uptime(const JSONRPCRequest& jsonRequest)

0 commit comments

Comments
 (0)