diff --git a/src/cpp/ripple/Config.cpp b/src/cpp/ripple/Config.cpp index 6bc63d9e8b..57fa18979d 100644 --- a/src/cpp/ripple/Config.cpp +++ b/src/cpp/ripple/Config.cpp @@ -288,7 +288,7 @@ void Config::load() if (!jrReader.parse(strJson, jvCommand)) throw std::runtime_error(boost::str(boost::format("Couldn't parse ["SECTION_RPC_STARTUP"] command: %s") % strJson)); - RPC_STARTUP.append(jvCommand); + jvArray.append(jvCommand); } RPC_STARTUP = jvArray; diff --git a/src/cpp/ripple/Wallet.cpp b/src/cpp/ripple/Wallet.cpp index 2445367690..ed017304f7 100644 --- a/src/cpp/ripple/Wallet.cpp +++ b/src/cpp/ripple/Wallet.cpp @@ -30,7 +30,8 @@ void Wallet::start() throw std::runtime_error("unable to retrieve new node identity."); } - std::cerr << "NodeIdentity: " << mNodePublicKey.humanNodePublic() << std::endl; + if (!theConfig.QUIET) + std::cerr << "NodeIdentity: " << mNodePublicKey.humanNodePublic() << std::endl; theApp->getUNL().start(); } @@ -71,7 +72,8 @@ bool Wallet::nodeIdentityLoad() // Create and store a network identity. bool Wallet::nodeIdentityCreate() { - std::cerr << "NodeIdentity: Creating." << std::endl; + if (!theConfig.QUIET) + std::cerr << "NodeIdentity: Creating." << std::endl; // // Generate the public and private key @@ -116,7 +118,8 @@ bool Wallet::nodeIdentityCreate() { % sqlEscape(strDh1024))); // XXX Check error result. - std::cerr << "NodeIdentity: Created." << std::endl; + if (!theConfig.QUIET) + std::cerr << "NodeIdentity: Created." << std::endl; return true; } diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp index e7d0379c98..4faab81028 100644 --- a/src/cpp/ripple/main.cpp +++ b/src/cpp/ripple/main.cpp @@ -37,13 +37,14 @@ void startServer() const Json::Value& jvCommand = theConfig.RPC_STARTUP[i]; if (!theConfig.QUIET) - cerr << "Startup RPC: " << jvCommand << endl; + std::cerr << "Startup RPC: " << jvCommand << std::endl; RPCHandler rhHandler(&theApp->getOPs()); - std::cerr << "Result: " - << rhHandler.doCommand(jvCommand, RPCHandler::ADMIN) - << std::endl; + Json::Value jvResult = rhHandler.doCommand(jvCommand, RPCHandler::ADMIN); + + if (!theConfig.QUIET) + std::cerr << "Result: " << jvResult << std::endl; } }