From 5cd3a710bd298fb20e7399e6f3d7f2aaf41dc10a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 18 Dec 2019 17:16:12 -0500 Subject: [PATCH] Skipped lines that do no match a FIX prefix in FIX logs. This is needed at the ICE where some messages can have new lines. We use the new line separator to separate FIX messages so the parser was getting confused when it saw multi-line messages. --- src/lib/jetfix/store/FIXFileStore.cpp | 13 +++++++++++-- src/lib/jetfix/store/FIXFileStore.h | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib/jetfix/store/FIXFileStore.cpp b/src/lib/jetfix/store/FIXFileStore.cpp index 25c4d05cd..2136042be 100644 --- a/src/lib/jetfix/store/FIXFileStore.cpp +++ b/src/lib/jetfix/store/FIXFileStore.cpp @@ -19,6 +19,7 @@ #include #include #include +#include namespace bts { namespace jetfix { @@ -113,6 +114,13 @@ std::string store_path(std::string base_path, return result.string(); } +bool is_valid_store_line(std::string const&line) { + std::regex rx("\\d\\d\\d\\d\\d\\d\\d\\d-" + "\\d\\d:\\d\\d:\\d\\d\\." + "\\d\\d\\d . 8=FIX\\.4\\.2.*"); + return std::regex_match(line, rx); +} + std::map load_replay(config::JetFIX::Connection const &cfg, std::string const &path, uint32_t ) { @@ -122,13 +130,14 @@ load_replay(config::JetFIX::Connection const &cfg, std::string const &path, std::ifstream f(path); std::string line_buffer; line_buffer.reserve(10 * 1024); - auto header_size = sizeof("20150427-19:05:17.032 < ") - 1; std::string date_buffer("20150427-19:05:17.032"); for (;;) { std::getline(f, line_buffer); if (!f.eof()) { - bts_assert(line_buffer.size() > header_size); + if (!is_valid_store_line(line_buffer)) + continue; + if (line_buffer[22] == '<') { auto ts = datetime::parse_FIX_timestamp(line_buffer.substr(0, 21)); diff --git a/src/lib/jetfix/store/FIXFileStore.h b/src/lib/jetfix/store/FIXFileStore.h index e98c41f8d..5e0f5040b 100644 --- a/src/lib/jetfix/store/FIXFileStore.h +++ b/src/lib/jetfix/store/FIXFileStore.h @@ -29,4 +29,6 @@ private: std::unique_ptr me; }; +bool is_valid_store_line(std::string const&) ; + }}