Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
JoelKatz
2013-01-21 17:12:21 -08:00
3 changed files with 12 additions and 8 deletions

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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;
}
}