diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 66ac2cb5d..667233c71 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -24,7 +24,6 @@ #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" #include "server/sparkd/position/PositionServiceServer.h" -#include "lib/config/protos/toggles.pb.h" #include "lib/md/relay/QueryServer.h" #include @@ -56,9 +55,8 @@ int Run::execute(std::vector const &) { md::run_query_server(sc, synthetic_service, stats)); orderman::OrderServiceServer order_service_server(sc, synthetic_service,stats); support::ErrorReportServer error_report_service(sc); - admin::AdminServiceServer admin_service(sc); - if(config::get().enabled()) - md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); + admin::AdminServiceServer admin_service(sc); + md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); position::PositionServiceServer position_service(sc); metrics::ShellLatencyServer shell_latency_service(sc, stats, utils::Dispatcher::background()); diff --git a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp b/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp index 8c8d6c454..87f863edb 100644 --- a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp +++ b/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp @@ -8,6 +8,8 @@ #include "lib/md/get_symbols.h" #include "VolumeAtPriceState.h" #include "lib/utils/bts_chrono.h" +#include "lib/config/config.h" +#include "lib/config/protos/toggles.pb.h" namespace bts{ namespace md{ @@ -17,6 +19,7 @@ using namespace bts::co2; using namespace bts::api::md::auxiliary; struct MarketDataAuxiliaryServiceServer::PImpl{ + bool vap_enabled; MarketDataRelay relay_service; MarketDataAuxiliaryServiceBase::Volume_at_priceStatefulPublisher publisher; std::unique_ptr trade_timer; @@ -24,7 +27,8 @@ struct MarketDataAuxiliaryServiceServer::PImpl{ VolumeAtPriceState state; PImpl(bts::api::ServiceContext& context, const MarketDataAuxiliaryServiceBase::Volume_at_priceStatefulPublisher& publisher) - : + : + vap_enabled(config::get().enabled()), relay_service(context.locate()), publisher(publisher), trade_timer(), @@ -39,19 +43,21 @@ MarketDataAuxiliaryServiceServer::MarketDataAuxiliaryServiceServer( MarketDataAuxiliaryServiceBase(context), me(new PImpl(context, make_volume_at_price_stateful_publisher())){ - auto& threadpool = utils::Dispatcher::get_named("TradesQuery"); - me->trade_timer = - std::make_unique(threadpool, - me->poll_period_ms, - [this]() { - me->relay_service.requestmd(me->state.md_req(), - [this](const bts::api::Result& md_reply) - { - if(md_reply.result()!=nullptr) - _scan_trades(*md_reply.result());} - ); - }); - me->trade_timer->start(); + if(me->vap_enabled){ + auto& threadpool = utils::Dispatcher::get_named("TradesQuery"); + me->trade_timer = + std::make_unique(threadpool, + me->poll_period_ms, + [this]() { + me->relay_service.requestmd(me->state.md_req(), + [this](const bts::api::Result& md_reply) + { + if(md_reply.result()!=nullptr) + _scan_trades(*md_reply.result());} + ); + }); + me->trade_timer->start(); + } } void MarketDataAuxiliaryServiceServer::_scan_trades(const MDReply& md_reply){ diff --git a/src/server/sparkd/md/VolumeAtPriceState.cpp b/src/server/sparkd/md/VolumeAtPriceState.cpp index a42d5fc08..45a89f92b 100644 --- a/src/server/sparkd/md/VolumeAtPriceState.cpp +++ b/src/server/sparkd/md/VolumeAtPriceState.cpp @@ -43,7 +43,7 @@ ChannelVolume& VolumeAtPriceState::_update_or_add(const SecurityChannel& channel void VolumeAtPriceState::on_new_trades(const ChannelReply& reply, MarketDataAuxiliaryServiceBase::Volume_at_priceStatefulPublisher& publisher, uint32_t& n_trades, - uint32_t& total_unique_levels){ + uint32_t& total_unique_levels){ ChannelVolume& channel_vol=_update_or_add(reply.channel()); for(const TradeMessage& t : reply.trade_log()){ const VolumeAtPriceLevel& sec_level_vol=channel_vol.add_trade(t,