diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index 9e9902e59..9d3492668 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -52,6 +52,7 @@ message PublisherNamespace { message CMEOptions { enum OnixSLogMode { + None = 0; Important = 10; Regular = 50; Debug = 100; diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index 566f66e0d..674107454 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -351,6 +351,30 @@ void MDP3Listener::onBookUpdate(onixs::Handler&, const onixs::Security& sec, con } // // Trades +void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& arg) { + utils::TimeStamp ts = utils::TimeStamp::now(); + auto* data = _index.get_security(sec.id()); + if (data != NULL) { + int size; + arg.entry().entrySize(size); + onixs::PRICE price; + arg.entry().entryPx(price); + PriceSize ps = pricesize_of_price_size(price, data->handle.security().display_factor, size); + auto date = ll_of_timestamp(arg.message().transactTime()); + data->handle.add_trade(ts, ps, date, data->electronic_volume + size); + } +} +void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::TradeSummaryArgs& arg) { + utils::TimeStamp ts = utils::TimeStamp::now(); + auto* data = _index.get_security(sec.id()); + if (data != NULL) { + auto size = arg.entry().entrySize(); + onixs::PRICE price = arg.entry().entryPx(); + PriceSize ps = pricesize_of_price_size(price, data->handle.security().display_factor, size); + auto date = ll_of_timestamp(arg.message().transactTime()); + data->handle.add_trade(ts, ps, date, data->electronic_volume + size); + } +} void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::TradeArgs& arg) { utils::TimeStamp ts = utils::TimeStamp::now(); if (arg.entry().updateAction() == onixs::UpdateAction::New) { diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index 922eb3efd..8e6eb7b38 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -56,7 +56,9 @@ public: // // Trades + void onTrade(onixs::Handler&, const onixs::Security&, const onixs::RecoveryEntryArgs&) override; void onTrade(onixs::Handler&, const onixs::Security&, const onixs::TradeArgs&) override; + void onTrade(onixs::Handler&, const onixs::Security&, const onixs::TradeSummaryArgs&) override; // // RFQ diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index a80c4b491..578a856a6 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -29,8 +29,7 @@ MDP3Main::MDP3Main() : _engines(), _handlers(), _listeners(), - _recovery(), - _loggers() + _recovery() { } @@ -260,10 +259,16 @@ unique_ptr MDP3Main::prepare_handler(const string& channel_id) { // // Logging - onixs::FileLoggerSettings loggerSettings; - loggerSettings.filename(log_path() + "/log_" + channel_id); - loggerSettings.severityLevel((onixs::LogSeverity::Enum)options.onixs_log_mode()); - std::unique_ptr logger(new onixs::FileLogger(loggerSettings)); + onixs::Logger* logger; + if (options.onixs_log_mode() == CMEOptions_OnixSLogMode_None) { + logger = new onixs::NullLogger(); + } + else { + onixs::FileLoggerSettings loggerSettings; + loggerSettings.filename(log_path() + "/log_" + channel_id); + loggerSettings.severityLevel((onixs::LogSeverity::Enum)options.onixs_log_mode()); + logger = new onixs::FileLogger(loggerSettings); + } // @@ -294,7 +299,6 @@ unique_ptr MDP3Main::prepare_handler(const string& channel_id) { } if (logger) { handler->bindLogger(*logger); - _loggers.push_back(std::move(logger)); } return handler; diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h index 2b7c1e812..29db86d04 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h @@ -45,7 +45,6 @@ private: std::vector> _handlers; std::vector> _listeners; std::vector> _recovery; - std::vector> _loggers; }; }}//namespace diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/onixs.h b/src/server/sparkd/md/platforms/mdp3_onixs/onixs.h index 4a029aac1..30b2f7052 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/onixs.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/onixs.h @@ -1,4 +1,7 @@ #pragma once #include -namespace onixs = OnixS::CME::MDH; +// namespace onixs = OnixS::CME::MDH; +namespace onixs { + using namespace OnixS::CME::MDH; +} \ No newline at end of file