From a2b890506a49e1b02cd8f29bb82d07910f3e5006 Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Mon, 21 Jan 2013 16:46:45 -0800
Subject: [PATCH 1/3] Make RPC startup results obey quiet.

---
 src/cpp/ripple/main.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp
index e7d0379c9..bf187ad80 100644
--- a/src/cpp/ripple/main.cpp
+++ b/src/cpp/ripple/main.cpp
@@ -41,9 +41,10 @@ void startServer()
 
 			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;
 		}
 	}
 

From 6aa9a3fc9080bad063977a251ce4de2e269840d4 Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Mon, 21 Jan 2013 16:54:51 -0800
Subject: [PATCH 2/3] Fix [rpc_startup].

---
 src/cpp/ripple/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpp/ripple/Config.cpp b/src/cpp/ripple/Config.cpp
index 6bc63d9e8..57fa18979 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;

From ab6ab491eb24bb28410df6d79ed187868a0e13ee Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Mon, 21 Jan 2013 17:02:15 -0800
Subject: [PATCH 3/3] Make -q more quiet.

---
 src/cpp/ripple/Wallet.cpp | 9 ++++++---
 src/cpp/ripple/main.cpp   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/cpp/ripple/Wallet.cpp b/src/cpp/ripple/Wallet.cpp
index 244536769..ed017304f 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 bf187ad80..4faab8102 100644
--- a/src/cpp/ripple/main.cpp
+++ b/src/cpp/ripple/main.cpp
@@ -37,7 +37,7 @@ 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());