ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj
	modules/ripple_app/ripple_app.cpp
	modules/ripple_websocket/ripple_websocket.cpp
	src/cpp/ripple/NetworkOPs.cpp
	src/cpp/ripple/ripple_Application.cpp
	src/cpp/ripple/ripple_Peer.cpp
This commit is contained in:
JoelKatz
2013-07-07 15:28:18 -07:00
parent f9b282b424 dc08a9061e
commit 37fe9a6098
18 changed files with 135 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpp/ripple/ripple_Application.cpp
View File

@@ -843,14 +843,6 @@ bool serverOkay (std::string& reason)
if (!theConfig.ELB_SUPPORT)
return true;
/*
if (!theApp)
{
reason = "Server has not started";
return false;
}
*/
if (getApp().isShutdown ())
{
reason = "Server is shutting down";
@@ -869,6 +861,9 @@ bool serverOkay (std::string& reason)
return false;
}
if (!getApp().getLedgerMaster().isCaughtUp(reason))
return false;
if (getApp().getFeeTrack ().isLoaded ())
{
reason = "Too much load";