Skip to content

Commit

Permalink
Merge bitcoin#556: Fix a few Bitcoin server strings
Browse files Browse the repository at this point in the history
fa9841b Fix a few Bitcoin server strings (Gregory Sanders)

Pull request description:

  Resolves ElementsProject/elements#555

Tree-SHA512: 810162d3ffce21e930f91b8a244a328e2f5f1fee1db45094a5f8d416adfdfea8516d4a936eaee6e5afd2e65ddf13980349a06a657a3941aba65798ee74824fc5
  • Loading branch information
stevenroose committed Apr 3, 2019
2 parents a904f02 + fa9841b commit cb9f28c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/bitcoind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ static bool AppInit(int argc, char* argv[])
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
fprintf(stdout, "Bitcoin server starting\n");
fprintf(stdout, "Elements server starting\n");

// Daemonize
if (daemon(1, 0)) { // don't chdir (1), do close FDs (0)
Expand Down
4 changes: 2 additions & 2 deletions src/rpc/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
throw std::runtime_error(
"stop\n"
"\nStop Bitcoin server.");
"\nStop Elements server.");
// Event loop will exit after current HTTP requests have been handled, so
// this reply will get back to the client.
StartShutdown();
return "Bitcoin server stopping";
return "Elements server stopping";
}

static UniValue uptime(const JSONRPCRequest& jsonRequest)
Expand Down

0 comments on commit cb9f28c

Please sign in to comment.