From d52ea0e997131c7e721a2a54d53442519dd2ca40 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 7 Apr 2023 01:41:06 +0000 Subject: [PATCH] Adding macro to stop MarketDataConfigUtils from building into windows --- docker/linux | 1 + docker/windows | 1 + src/lib/api/md/MarketDataConfigUtils.cpp | 4 +- .../profiles/default/MarketDataConfig.conf | 49 +++++++++++++++++++ src/lib/md/MarketDataGateway.cpp | 4 +- .../md/platforms/emumba/EmMDListener.cpp | 4 +- 6 files changed, 60 insertions(+), 3 deletions(-) create mode 160000 docker/linux create mode 160000 docker/windows create mode 100644 src/lib/config/profiles/default/MarketDataConfig.conf diff --git a/docker/linux b/docker/linux new file mode 160000 index 000000000..81567b1f8 --- /dev/null +++ b/docker/linux @@ -0,0 +1 @@ +Subproject commit 81567b1f82b8824aecfc376ffc0c4c881fbb39df diff --git a/docker/windows b/docker/windows new file mode 160000 index 000000000..de7d40c09 --- /dev/null +++ b/docker/windows @@ -0,0 +1 @@ +Subproject commit de7d40c09de473e1b2802c4b27e03dc7f0c360d6 diff --git a/src/lib/api/md/MarketDataConfigUtils.cpp b/src/lib/api/md/MarketDataConfigUtils.cpp index 7d01544a1..7e43f64ff 100644 --- a/src/lib/api/md/MarketDataConfigUtils.cpp +++ b/src/lib/api/md/MarketDataConfigUtils.cpp @@ -1,3 +1,4 @@ +#if !defined(_WIN32) #include "MarketDataConfigUtils.h" #include "lib/api/md/MarketDataConfig.pb.h" #include "lib/domain_model/Security.pb.h" @@ -65,4 +66,5 @@ MarketDataConfigUtils::get_effective_recording_config( return rv; } -} // namespace bts::md \ No newline at end of file +} // namespace bts::md +#endif \ No newline at end of file diff --git a/src/lib/config/profiles/default/MarketDataConfig.conf b/src/lib/config/profiles/default/MarketDataConfig.conf new file mode 100644 index 000000000..19ba72509 --- /dev/null +++ b/src/lib/config/profiles/default/MarketDataConfig.conf @@ -0,0 +1,49 @@ +MarketDataConfig { + value { + # binance { + # num_depth_levels: 5 + # url_rest_base: "https://testnet.binance.vision" + # url_ws_base: "wss://testnet.binance.vision" + # security_criteria { + # clauses { + # security_types: SPOT + # symbols: "BTC" + # symbols: "ETH" + # } + # } + # } + + # binance_us { + # num_depth_levels: 5 + # url_rest_base: "https://api.binance.us" + # url_ws_base: "wss://stream.binance.us:9443" + # security_criteria { + # clauses { + # security_types: SPOT + # symbols: "BTC" + # symbols: "ETH" + # } + # } + # } + + # binance_usds_futures { + # num_depth_levels: 5 + # url_rest_base: "https://testnet.binancefuture.com" + # url_ws_base: "wss://fstream.binance.com" + # security_criteria { + # clauses { + # security_types: FUTURE + # symbols: "BTC" + # symbols: "ETH" + # } + # } + # security_desc_formattings { + # expression: "^(.+)(USD)(?=_)(.*)" + # format: "$1USDT$3" + # } + # } + deribit { + json_conf_file_name: "deribit_demo_config.json" + } + } +} diff --git a/src/lib/md/MarketDataGateway.cpp b/src/lib/md/MarketDataGateway.cpp index 5c2784510..9e6228d32 100644 --- a/src/lib/md/MarketDataGateway.cpp +++ b/src/lib/md/MarketDataGateway.cpp @@ -145,8 +145,10 @@ void MarketDataGateway::_start_deribit( //threading::make_thread("Emumba", []() { run_emumba(); }).detach(); auto start_deribit_thr = [&]() { const auto &deribit_conf_items = cfg.deribit(); - if (deribit_conf_items.size() != 1) + if (deribit_conf_items.size() != 1) { + LOG(md, Warn, "MarketDataGateway::_start_deribit deribit is disabled"); return; + } const auto &deribit_conf = deribit_conf_items.at(0); const auto config_path = Path{config::get().config_path()} / deribit_conf.json_conf_file_name(); diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index dc41ac945..e1f89b218 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -387,7 +387,9 @@ SecurityAuxData &get_sud( } EmMDListener::EmMDListener(EmumbaSecurityIndex &index, MDProducer &md_producer) - : me(std::make_unique(index, md_producer)) {} + : me(std::make_unique(index, md_producer)) { + LOG(md, Info, "EmMDListener launched"); +} void run(__attribute__((unused)) const std::string &config_path) {}