LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

log: harmonize bitcoind server logging

Browse source 
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.")'`.
This commit is contained in:
Jon Atack 2019-07-27 16:28:48 +02:00
parent e653eeff76
commit e90478f43e
No known key found for this signature in database
GPG key ID: 4F5721B3D0E3921D
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bitcoind.cpp
View file

@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2018 The Bitcoin Core developers // Copyright (c) 2009-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -77,7 +77,7 @@ static bool AppInit(int argc, char* argv[])
// Process help and version before taking care about datadir // Process help and version before taking care about datadir
if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
std::string strUsage = PACKAGE_NAME " Daemon version " + FormatFullVersion() + "\n"; std::string strUsage = PACKAGE_NAME " version " + FormatFullVersion() + "\n";
if (gArgs.IsArgSet("-version")) if (gArgs.IsArgSet("-version"))
{ {
@ -85,7 +85,7 @@ static bool AppInit(int argc, char* argv[])
} }
else else
{ {
strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME " Daemon\n"; strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n";
strUsage += "\n" + gArgs.GetHelpMessage(); strUsage += "\n" + gArgs.GetHelpMessage();
} }
@ -143,7 +143,7 @@ static bool AppInit(int argc, char* argv[])
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
tfm::format(std::cout, PACKAGE_NAME " daemon starting\n"); tfm::format(std::cout, PACKAGE_NAME " starting\n");
// Daemonize // Daemonize
if (daemon(1, 0)) { // don't chdir (1), do close FDs (0) if (daemon(1, 0)) { // don't chdir (1), do close FDs (0)

4
src/rpc/server.cpp
View file

@ -162,7 +162,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
if (jsonRequest.fHelp || jsonRequest.params.size() > 1) if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
throw std::runtime_error( throw std::runtime_error(
RPCHelpMan{"stop", RPCHelpMan{"stop",
"\nStop Bitcoin server.", "\nRequest a graceful shutdown of " PACKAGE_NAME ".",
{}, {},
RPCResults{}, RPCResults{},
RPCExamples{""}, RPCExamples{""},
@ -173,7 +173,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
if (jsonRequest.params[0].isNum()) { if (jsonRequest.params[0].isNum()) {
MilliSleep(jsonRequest.params[0].get_int()); MilliSleep(jsonRequest.params[0].get_int());
} }
return "Bitcoin server stopping"; return PACKAGE_NAME " stopping";
} }
static UniValue uptime(const JSONRPCRequest& jsonRequest) static UniValue uptime(const JSONRPCRequest& jsonRequest)