diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 83cc1af9b..20e06a366 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -63,7 +63,7 @@ void run_cleanup() { } std::thread* _md_thread; -void run_market_datapublishers() { +void run_market_datapublishers(bool should_return) { bts_assert(_md_thread == nullptr); // start a thread for the md _md_thread = new std::thread([]() { @@ -78,7 +78,12 @@ void run_market_datapublishers() { } }); - std::this_thread::sleep_for(2s); + if(should_return) { + std::this_thread::sleep_for(2s); + } + else { + _md_thread->join(); + } } void run_record(const std::string& arg){ @@ -137,7 +142,7 @@ void md_tool(std::vector const &args) { else if (cmd == "cleanup") run_cleanup(); else if (cmd == "dump") run_dump(args.size() > 1 ? args[1] : "", args.size() > 2 ? args[2] : ""); else if (cmd == "replay") run_replay(); - else if (cmd == "run") run_market_datapublishers(); + else if (cmd == "run") run_market_datapublishers(false); else if (cmd == "relay") relay_everything(); else printhelp(); } diff --git a/src/server/sparkd/md/run_md.h b/src/server/sparkd/md/run_md.h index 587a6e0c1..c7d9c501b 100644 --- a/src/server/sparkd/md/run_md.h +++ b/src/server/sparkd/md/run_md.h @@ -5,7 +5,7 @@ namespace bts { namespace md { -void run_market_datapublishers(); +void run_market_datapublishers(bool should_return=true); void md_tool(std::vector const& args); }}