Fix last trade from snapshot and enable onixs::NullLogger in config
This commit is contained in:
1 parent
d3862bbcb9
commit
7efbbd0b25
6 files changed
+42
-9
No files matched your search
@@ -52,6 +52,7 @@ message PublisherNamespace {
|
||||
message CMEOptions
|
||||
{
|
||||
enum OnixSLogMode {
|
||||
None = 0;
|
||||
Important = 10;
|
||||
Regular = 50;
|
||||
Debug = 100;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -29,8 +29,7 @@ MDP3Main::MDP3Main() :
|
||||
_engines(),
|
||||
_handlers(),
|
||||
_listeners(),
|
||||
_recovery(),
|
||||
_loggers()
|
||||
_recovery()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -260,10 +259,16 @@ unique_ptr<onixs::Handler> 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<onixs::FileLogger> 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<onixs::Handler> MDP3Main::prepare_handler(const string& channel_id) {
|
||||
}
|
||||
if (logger) {
|
||||
handler->bindLogger(*logger);
|
||||
_loggers.push_back(std::move(logger));
|
||||
}
|
||||
|
||||
return handler;
|
||||
|
||||
@@ -45,7 +45,6 @@ private:
|
||||
std::vector<std::unique_ptr<onixs::Handler>> _handlers;
|
||||
std::vector<std::unique_ptr<MDP3Listener>> _listeners;
|
||||
std::vector<std::unique_ptr<onixs::TcpRecoveryService>> _recovery;
|
||||
std::vector<std::unique_ptr<onixs::FileLogger>> _loggers;
|
||||
};
|
||||
|
||||
}}//namespace
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
#pragma once
|
||||
#include <OnixS/CME/MDH.h>
|
||||
|
||||
namespace onixs = OnixS::CME::MDH;
|
||||
// namespace onixs = OnixS::CME::MDH;
|
||||
namespace onixs {
|
||||
using namespace OnixS::CME::MDH;
|
||||
}
|
||||
Reference in new issue
Block a user