From 33f533af9b19eb778174c81dce3ddbc8d058da9b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 8 Jul 2019 13:08:18 -0400 Subject: [PATCH] set span to default off, hook up admin boolean to enforce span behind config key --- src/lib/config/defaults/span.conf | 2 +- src/lib/orderman/limiter/LimitStore.h | 24 +++++++++---------- .../sparkd/position/MarginServiceServer.cpp | 3 ++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/lib/config/defaults/span.conf b/src/lib/config/defaults/span.conf index 7f86bfab3..96ea56a5a 100644 --- a/src/lib/config/defaults/span.conf +++ b/src/lib/config/defaults/span.conf @@ -1,7 +1,7 @@ SpanMargin { value { - enabled: true + enabled: false login: 'api_bts1' password: 'Summer123' url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 7efcf76ab..2f2f527d4 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -275,20 +275,20 @@ private: const auto acct_it = _account_data_map.find(account_id.value()); if(acct_it != _account_data_map.end()){ const auto& account_data = acct_it->second; - //const auto& account = account_data.account; + const auto& account = account_data.account; if(config::get().enabled()) { - // if (account.has_margin_limit() && - // account.margin_limit().enforce_margin()){ - double ex_liq = account_data.excess_liquidity; - if(os::is_nan(ex_liq)){ - out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; - out_res.error_msg = "Could not find account Excess Liquidity"; - } - else{ - if(ex_liq < 0){ + if (account.has_margin_limit() && account.margin_limit().enforce_margin()){ + double ex_liq = account_data.excess_liquidity; + if(os::is_nan(ex_liq)){ out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; - out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", - ex_liq); + out_res.error_msg = "Could not find account Excess Liquidity"; + } + else{ + if(ex_liq < 0){ + out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; + out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", + ex_liq); + } } } } diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index bdc286cac..2b3c790b0 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -162,7 +162,8 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M { report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); report.set_cash_balance(acct->margin_limit().cash_balance()); - report.set_should_enforce_margin(acct->margin_limit().enforce_margin()); + report.set_should_enforce_margin(acct->margin_limit().enforce_margin() && + config::get().enabled()); } double netliq = report.leverage_factor() * report.cash_balance();