mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-10-11 12:03:04 +02:00
log: harmonize bitcoind server logging
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:
@@ -1,5 +1,5 @@
|
||||
// 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
|
||||
// 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
|
||||
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"))
|
||||
{
|
||||
@@ -85,7 +85,7 @@ static bool AppInit(int argc, char* argv[])
|
||||
}
|
||||
else
|
||||
{
|
||||
strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME " Daemon\n";
|
||||
strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n";
|
||||
strUsage += "\n" + gArgs.GetHelpMessage();
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ static bool AppInit(int argc, char* argv[])
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#endif
|
||||
tfm::format(std::cout, PACKAGE_NAME " daemon starting\n");
|
||||
tfm::format(std::cout, PACKAGE_NAME " starting\n");
|
||||
|
||||
// Daemonize
|
||||
if (daemon(1, 0)) { // don't chdir (1), do close FDs (0)
|
||||
|
Reference in New Issue
Block a user