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

Improve watchdog start logic

Browse Source
This commit is contained in:
Nik Bougalis
2016-04-08 09:30:22 -07:00
parent 76d7c1c01a
commit 51850ded05
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ripple/app/main/Main.cpp
View File

@@ -266,20 +266,6 @@ int run (int argc, char** argv)
return 0;
}
// Use a watchdog process unless we're invoking a stand alone type of mode
//
if (HaveSustain ()
&& !vm.count ("parameters")
&& !vm.count ("fg")
&& !vm.count ("standalone")
&& !vm.count ("unittest"))
{
std::string logMe = DoSustain ();
if (!logMe.empty ())
std::cerr << logMe << std::endl;
}
// Run the unit tests if requested.
// The unit tests will exit the application with an appropriate return code.
//
@@ -432,6 +418,14 @@ int run (int argc, char** argv)
// No arguments. Run server.
if (!vm.count ("parameters"))
{
if (HaveSustain() && !vm.count ("fg") && !config->RUN_STANDALONE)
{
auto const ret = DoSustain ();
if (!ret.empty ())
std::cerr << "Watchdog: " << ret << std::endl;
}
if (vm.count ("debug"))
setDebugJournalSink (logs->get("Debug"));