diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index ddcebb619..dbc0b43fe 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -123,14 +123,14 @@ message RecordOptions { // Replay options // message ReplayOptions { - optional string host = 1 [default = "mdreplay"]; - optional string base_path = 2 [default = "/spark"]; - optional string file_name = 3 [default = "futures.coconut"]; + optional string url = 1 [default = "http://mdreplay.bluetradesys.local/spark/futures.coconut"]; // 2.0 = double speed, 0.5 = half speed optional double speed = 11 [default = 1.0]; optional bool interactive = 12 [default = false]; + + optional string fallback = 20 [default ="./data_files/futures.coconut"]; } message RelayOptions { diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib/md/relay/RelayRecorder.cpp index a6f453e73..124cdf920 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib/md/relay/RelayRecorder.cpp @@ -182,23 +182,46 @@ void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) auto filename = url.substr(last_slash+1); filename = os::sparkdata_path("data/replay/") + filename; utils::download_file_if_newer(host, path, filename); - replay_file(filename, writer, naggle_ms, true); + if (boost::filesystem::exists(filename)) { + replay_file(filename, writer, naggle_ms, true); + } +} + +void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) { + // loops forever + replay_url(url, writer, naggle_ms); + // If it returns it means it failed to download or play cached + const auto fallback = config::get().fallback(); + if (boost::filesystem::exists(fallback)) { + replay_file(fallback, writer, naggle_ms); + } + } shared_ptr mkrelayproducer(bool shared); + /*this is the public one*/ -void replay_recording(const string& filename, int32_t naggle_ms) { +void replay_recording(const string& filename, int32_t naggle_ms, const std::string fallback) { auto writer = mkrelayproducer(true); if (config::get().interactive()) { naggle_ms = -1; } + // Try relay_url/replay_file + // If it fails resort to the fallback location + if (filename.find("http://") == 0) { + // loops forever replay_url(filename, *writer, naggle_ms); } - else { + else if (boost::filesystem::exists(filename)) { + // loops forever replay_file(filename, *writer, naggle_ms); } + // try fallback + if (boost::filesystem::exists(fallback)) { + replay_file(fallback, *writer, naggle_ms); + } } void print_recording(const string& filename) { ConsoleReplayWriter writer; diff --git a/src/lib/md/relay/RelayRecorder.h b/src/lib/md/relay/RelayRecorder.h index fbcd53617..d70dd4757 100644 --- a/src/lib/md/relay/RelayRecorder.h +++ b/src/lib/md/relay/RelayRecorder.h @@ -28,8 +28,9 @@ void record_everything(std::string path, std::string filename); void print_recording(const std::string&); void unprint_recording(const std::string& src, const std::string& dest); void trace_recording(const std::string& file, security_key key); -void replay_recording(const std::string&, int32_t delay_ms); +void replay_recording(const std::string&, int32_t delay_ms, const std::string fallback=""); void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms); +void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms); void replay_file(const std::string& filename, IRelayWriter& writer, int32_t naggle_ms, bool loop=false); }}//namespace diff --git a/src/lib/utils/HTTPStream.cpp b/src/lib/utils/HTTPStream.cpp index e594fa41f..76dbf50bb 100755 --- a/src/lib/utils/HTTPStream.cpp +++ b/src/lib/utils/HTTPStream.cpp @@ -65,6 +65,7 @@ HTTPStream::HTTPStream(const std::string& host, const std::string& path, const s HTTPStream::~HTTPStream() { } +// returns true if file was downloaded bool download_file_if_newer(const string& host, const string& path, const string& destination) { struct stat st = boost::initialized_value; stat(destination.c_str(), &st); diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.cpp b/src/server/sparkd/exchange_sim/ExchangeSim.cpp index 0dda72a44..d457d53d5 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSim.cpp @@ -148,7 +148,7 @@ int start_exchange_sim() switch(conf.source_case()) { case config::ExchangeSim::SOURCE_NOT_SET: case config::ExchangeSim::kReplayUrl: - md::replay_url(conf.replay_url(), + md::replay_url_with_fallback(conf.replay_url(), player, config::get().naggle_ms()); break; diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 75cc6192d..40dbdd748 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -58,9 +58,11 @@ void clean_dir(const std::string base_path) { } void run_replay() { - auto naggle_ms = config::get().naggle_ms(); - auto file = "http://mdreplay.bluetradesys.local/spark/futures.coconut"; - replay_recording(file, naggle_ms); + auto naggle_ms = config::get().naggle_ms(); + const auto& options = config::get(); + auto file = options.url(); + auto fallback_path = options.fallback(); + replay_recording(file, naggle_ms, fallback_path); } void run_onixs() {