DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improved logging

Browse Source
This commit is contained in:
Duke Leto
2020-11-21 05:41:33 -05:00
parent 209d073204
commit ed8f8c534e
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/bitcoind.cpp
View File

@@ -131,11 +131,7 @@ bool AppInit(int argc, char* argv[])
bool fRet = false; bool fRet = false;
//fprintf(stderr, "%s start, argc=%d\n", __FUNCTION__, argc);
//
// Parameters // Parameters
//
// If Qt is used, parameters/komodo.conf are parsed in qt/bitcoin.cpp's main()
ParseParameters(argc, argv); ParseParameters(argc, argv);
// Process help and version before taking care about datadir // Process help and version before taking care about datadir
@@ -146,11 +142,9 @@ bool AppInit(int argc, char* argv[])
if (mapArgs.count("-version")) if (mapArgs.count("-version"))
{ {
strUsage += LicenseInfo(); strUsage += LicenseInfo();
} } else {
else
{
strUsage += "\n" + _("Usage:") + "\n" + strUsage += "\n" + _("Usage:") + "\n" +
" komodod [options] " + _("Start Hush-flavored Komodo Daemon") + "\n"; " hushd [options] " + _("Start a Hush Daemon") + "\n";
strUsage += "\n" + HelpMessage(HMM_BITCOIND); strUsage += "\n" + HelpMessage(HMM_BITCOIND);
} }
@@ -166,12 +160,12 @@ bool AppInit(int argc, char* argv[])
fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n"); fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n");
return false; return false;
} }
void komodo_args(char *argv0); void hush_args(char *argv0);
komodo_args(argv[0]); hush_args(argv[0]);
void chainparams_commandline(); void chainparams_commandline();
chainparams_commandline(); chainparams_commandline();
fprintf(stderr,"call komodo_args.(%s) NOTARY_PUBKEY.(%s)\n",argv[0],NOTARY_PUBKEY.c_str()); fprintf(stderr,"hush_args.(%s) NOTARY_PUBKEY.(%s) argc=%d\n",argv[0],NOTARY_PUBKEY.c_str(), argc);
printf("initialized %s at %u\n",SMART_CHAIN_SYMBOL,(uint32_t)time(NULL)); printf("initialized %s at %u\n",SMART_CHAIN_SYMBOL,(uint32_t)time(NULL));
if (!boost::filesystem::is_directory(GetDataDir(false))) if (!boost::filesystem::is_directory(GetDataDir(false)))
{ {
@@ -209,15 +203,15 @@ bool AppInit(int argc, char* argv[])
// Command-line RPC // Command-line RPC
bool fCommandLine = false; bool fCommandLine = false;
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
//TODO: should this be hush: or komodo: ?? // detect accidental use of RPC in hushd
if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "komodo:")) { if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "hush:")) {
fCommandLine = true; fCommandLine = true;
} }
} }
if (fCommandLine) if (fCommandLine)
{ {
fprintf(stderr, "Error: There is no RPC client functionality in komodod. Use the komodo-cli utility instead.\n"); fprintf(stderr, "Error: Ooops! There is no RPC client functionality in hushd. Use the hush-cli utility instead.\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -225,7 +219,7 @@ bool AppInit(int argc, char* argv[])
fDaemon = GetBoolArg("-daemon", false); fDaemon = GetBoolArg("-daemon", false);
if (fDaemon) if (fDaemon)
{ {
fprintf(stdout, "Komodo %s server starting\n",SMART_CHAIN_SYMBOL); fprintf(stdout, "Hush %s server starting\n",SMART_CHAIN_SYMBOL);
// Daemonize // Daemonize
pid_t pid = fork(); pid_t pid = fork();