diff --git a/src/lib/orderman/actors/order_manager/OrderManagerShard.cpp b/src/lib/orderman/actors/order_manager/OrderManagerShard.cpp index 5f98a00bf..a1a9e085a 100644 --- a/src/lib/orderman/actors/order_manager/OrderManagerShard.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManagerShard.cpp @@ -18,6 +18,7 @@ #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" +#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/utils/bts_assert.h" #include "lib/utils/helper_macros.h" @@ -114,26 +115,35 @@ void filter_and_dispatch(const mercury::Update& update, } } +void OrderManagerShard::init() +{ + //this should give us all orders on all OMs + subscribe([this](const auto& update) + { + if(update.events) + { + me->all_orders.reserve(update.events->size()); + for (const auto &ev : *(update.events)) + me->all_orders.emplace(ev.key, *ev.def); + } + }); + OrderManager::init(); +} + + void OrderManagerShard::on_execution_report(const mercury::Update& upd) { UNUSED(upd); - //TODO this won't work because of child orders that get done on another OM - // if(me->cfg.is_unknown_order_catch_all() && upd.events) - // { - // for (const auto &ev : *(upd.events)) - // if(me->all_orders.find(ev.key()) == me->all_orders.end()) //if we don't know the order at all, try to recover it - // OrderManager::on_execution_report(upd); - // } + if(me->cfg.is_unknown_order_catch_all() && upd.events) + { + for (const auto &ev : *(upd.events)) + if(me->all_orders.find(ev.key()) == me->all_orders.end()) //if we don't know the order at all, try to recover it + OrderManager::on_execution_report(upd); + } } void OrderManagerShard::on_order_recovery(const mercury::Update& update) { - if(update.events) - { - me->all_orders.reserve(update.events->size()); - for (const auto &ev : *(update.events)) - me->all_orders.emplace(ev.key(), ev.order_record.def()); - } filter_and_dispatch(update, [this](const auto& ev) { @@ -149,11 +159,6 @@ void OrderManagerShard::on_order_recovery(const mercury::Update& update) { - if(update.events) - { - for (const auto &ev : *(update.events)) - me->all_orders.emplace(ev.order->key(), *ev.order->def()); - } filter_and_dispatch(update, [this](const auto& ev) { diff --git a/src/lib/orderman/actors/order_manager/OrderManagerShard.h b/src/lib/orderman/actors/order_manager/OrderManagerShard.h index 4c8805243..3cf214278 100644 --- a/src/lib/orderman/actors/order_manager/OrderManagerShard.h +++ b/src/lib/orderman/actors/order_manager/OrderManagerShard.h @@ -29,6 +29,7 @@ public: OrderManagerShard(const config::OrdermanShardCfg::OrderManagerShard&, const DynamicOrderRegistry&, trace::PerfLog&, md::SecurityOracle); virtual ~OrderManagerShard(); + void init() override; private: void on_order_recovery(const mercury::Update &) override;