diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index 5ee17c40c..e1ff0bbbe 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -145,4 +145,8 @@ message CMETradingSchedule { // we can elaborate later, but for now it's very simple: // this is "hours after midnight, in Central Time" optional double gen_open_hour = 1 [default = 8.5]; // 8:30 am CT +} + +message SecurityExpirationCutoff { + optional uint32 max_days_after_expiration =1 [default = 7]; } \ No newline at end of file diff --git a/src/lib/md/SecurityDB.cpp b/src/lib/md/SecurityDB.cpp index a2e740313..d84fbe4d4 100644 --- a/src/lib/md/SecurityDB.cpp +++ b/src/lib/md/SecurityDB.cpp @@ -5,9 +5,12 @@ #include "lib/config/config.h" #include "lib/config/protos/system.pb.h" #include "lib/md/Shm/FixedSecurity.h" +#include "lib/config/protos/MarketData.pb.h" #include #include +#include +#include #include using std::string; @@ -46,6 +49,15 @@ sqlite3_ptr open_db() { return dbptr; } +datetime::Date sec_expiration_cut_off() +{ + boost::gregorian::date_duration max_exp_age + (config::get().max_days_after_expiration()); + + auto pt = (datetime::now() - max_exp_age); + return datetime::Date(pt.date().year(),pt.date().month(),pt.date().day()); +} + size_t load_securities( const std::set& symbols, const std::function& callback) { @@ -57,8 +69,7 @@ size_t load_securities( auto db = dbptr.get(); auto select_stmt = prepare_query(db, "select key,symbol,venue,type,security_blob from securities where expiration > ?"); auto select = select_stmt.get(); - // sqlite3_bind_int(select, 1, datetime::today().to_short()); - sqlite3_bind_int(select, 1, 0); + sqlite3_bind_int(select, 1, sec_expiration_cut_off().to_short()); auto result = sqlite3_step(select); Security security; while (result == SQLITE_ROW) { @@ -207,4 +218,4 @@ datetime::Date expiration(const api::Security& security) { } } -}}}//namespace \ No newline at end of file +}}}//namespace