ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature-keyvadb

Browse Source 
Conflicts:
	src/cpp/ripple/ripple_TransactionAcquire.cpp
This commit is contained in:
JoelKatz
2013-07-22 13:32:10 -07:00
parent 64d45918eb 9cb06ba936
commit 69c16c19d6
15 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpp/ripple/ripple_Main.cpp
View File

@@ -299,7 +299,7 @@ int rippleMain (int argc, char** argv)
if (HaveSustain () &&
!iResult && !vm.count ("parameters") && !vm.count ("fg") && !vm.count ("standalone") && !vm.count ("unittest"))
{
std::string logMe = DoSustain ();
std::string logMe = DoSustain (theConfig.DEBUG_LOGFILE.c_str());
if (!logMe.empty ())
Log (lsWARNING) << logMe;