From 1590c6d6f63d6f8abe09c1480481bd8e836c422e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 27 Feb 2019 13:37:50 -0600 Subject: [PATCH 1/6] SPARK-2076 Sounds crash (Dan 1.5) --- src/client/spark/Notifications/INotificationService.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/client/spark/Notifications/INotificationService.cs b/src/client/spark/Notifications/INotificationService.cs index eb3823cc7..20cdc7659 100644 --- a/src/client/spark/Notifications/INotificationService.cs +++ b/src/client/spark/Notifications/INotificationService.cs @@ -25,14 +25,20 @@ namespace bts.shell { } static class NotificationServiceExtensions { + /// TODO: remove this extension and force callers to use the appropriate 'link' method in (it is smelly, and is NOT ACTUALLY STRONGLY TYPED) public static IDisposable link(this INotificationService notification_service, IPredicate predicate, SoundNotification sound) { if (predicate is IPredicate orp) return notification_service.link_to_order(orp, sound); + if (predicate is IPredicate osp) { + // Note: watch out for implicit types as generic type arguments (although OrderSecurity can be implicitly cast to OrderTuple, IPredicate CANNOT be implicitly cast to IPredicate) + return notification_service.link_to_order(PredicateBuilder.create(ot => osp.trigger(new OrderSecurity(ot.Item1, ot.Item2))), sound); + } if (predicate is IPredicate ap) return notification_service.link_to_activity(ap, sound); throw new ArgumentException(nameof(predicate)); } + /// TODO: remove this extension and force callers to use the appropriate 'link' method in (it is smelly, and is NOT ACTUALLY STRONGLY TYPED) public static IDisposable link(this INotificationService notification_service, INotificationPredicate toast_notification_predicate) { if (toast_notification_predicate is INotificationPredicate orp) return notification_service.link_to_order(orp); From 9864d18a60c338e2ed1e1e2dc28f8d97c0668c55 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 27 Feb 2019 14:37:53 -0600 Subject: [PATCH 2/6] SPARK-2076 [pr edit] log error instead of throwing an exception (when unable to link predicate). --- src/client/spark/Notifications/INotificationService.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Notifications/INotificationService.cs b/src/client/spark/Notifications/INotificationService.cs index 20cdc7659..282fcd3ca 100644 --- a/src/client/spark/Notifications/INotificationService.cs +++ b/src/client/spark/Notifications/INotificationService.cs @@ -35,7 +35,8 @@ namespace bts.shell { } if (predicate is IPredicate ap) return notification_service.link_to_activity(ap, sound); - throw new ArgumentException(nameof(predicate)); + Log.Ui.error($"Unable to activate sound-trigger (unrecognized predicate type '{typeof(T)}')."); + return Disposable.empty; } /// TODO: remove this extension and force callers to use the appropriate 'link' method in (it is smelly, and is NOT ACTUALLY STRONGLY TYPED) @@ -44,7 +45,8 @@ namespace bts.shell { return notification_service.link_to_order(orp); if (toast_notification_predicate is INotificationPredicate ap) return notification_service.link_to_activity(ap); - throw new ArgumentException(nameof(toast_notification_predicate)); + Log.Ui.error($"Unable to activate toast-notification-trigger (unrecognized predicate type '{typeof(T)}')."); + return Disposable.empty; } } From 509876736392aa33713f40f0393959081635e55f Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 28 Feb 2019 13:32:43 -0500 Subject: [PATCH 3/6] Avoided logging anything when warming up order manager cache. --- src/lib/orderman/orders/NativeOrder.cpp | 15 ++++++++------- src/lib/orderman/orders/NativeOrder.h | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 4085a3b81..1e23687e3 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -276,7 +276,8 @@ void NativeOrder::on_init_from_exe_report( NativeOrder::~NativeOrder() {} -bool NativeOrder::_on_activate(Price p, Quantity q, +bool NativeOrder::_on_activate(log::Level level, + Price p, Quantity q, bts::orderman::OrderServices &services, trace::CorID const &trace) { auto scoped_log = @@ -295,7 +296,7 @@ bool NativeOrder::_on_activate(Price p, Quantity q, // is our gateway connected? if (!me->services->is_gateway_connected(*me->session_services)) { - LOG(OrderMan, Warn, + LOG(OrderMan, level, "Attempt to send order to a disconnected gateway. " "Dropping order {}", key().value()); @@ -308,7 +309,7 @@ bool NativeOrder::_on_activate(Price p, Quantity q, UserID(me->definition.user_id()), AccountID(me->definition.account_id())); if (!lqr.ok) { - LOG(OrderMan, Warn, + LOG(OrderMan, level, "Unauthorized order attempted. User: {} on " "Account: {}. Msg: {} Order: {}. Dropping order", me->definition.user(), me->definition.account(), lqr.error_msg, @@ -325,7 +326,7 @@ bool NativeOrder::_on_activate(Price p, Quantity q, q); if (!lqr.ok) { - LOG(OrderMan, Warn, + LOG(OrderMan, level, "New order would breach limit. User: {} Account: " "{} Msg: {} Order: {}. Dropping order", me->definition.user(), me->definition.account(), lqr.error_msg, @@ -338,7 +339,7 @@ bool NativeOrder::_on_activate(Price p, Quantity q, // are we under the messaging threshold? if (!me->services->governor(*me->session_services).can_send()) { - LOG(OrderMan, Warn, + LOG(OrderMan, level, "New order would cause breach of messaging " "limits. Dropping order {}", key().value()); @@ -391,7 +392,7 @@ void NativeOrder::warm_up_activate(OrderServicesData &data, bts_assert(!me->services); me->services = &services; init_order_services(data, services); - _on_activate(Price(0), Quantity(0), services, trace::CorID{}); + _on_activate(NoLog,Price(0), Quantity(0), services, trace::CorID{}); me->services->unsubscribe_from_exe_report(*me->session_services, me->exe_report_sid); @@ -411,7 +412,7 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: // this is a brand new order - if (_on_activate(p, q, services, trace)) { + if (_on_activate(Warn,p, q, services, trace)) { me->services->queue_fix(*me->session_services, jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 16f1a8d18..a3465e7b0 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -39,7 +39,8 @@ protected: struct PImpl; std::unique_ptr me; - bool _on_activate(Price, Quantity, bts::orderman::OrderServices &, + bool _on_activate(log::Level log_level, + Price, Quantity, bts::orderman::OrderServices &, trace::CorID const &); void on_exe_report(const NewExecutionReportEvent &); void on_cancel_reject(const CancelRejectEvent &); From 4f3eaa8b9c4b0f4c18768e6da842653040fa6ebd Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 28 Feb 2019 13:43:41 -0500 Subject: [PATCH 4/6] Updated release notes. --- doc/user/content/release_notes/_index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 9dff2f59f..e2633e959 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,9 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 1.5.3 + - Avoided logging when warming up cache + ## 1.5.2 - Added better logging to AlgoDefinitionService From f25a667ff0e5c5641d1b5254c04ff751d9186641 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 28 Feb 2019 14:16:38 -0500 Subject: [PATCH 5/6] Fixed transition log msg when calling warm cache. --- src/lib/orderman/orders/NativeOrder.cpp | 43 +++++++++++++++---------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 1e23687e3..dce802050 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -1,10 +1,10 @@ #include "NativeOrder.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.h" #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" -#include "lib/domain_model/Security.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" @@ -276,8 +276,8 @@ void NativeOrder::on_init_from_exe_report( NativeOrder::~NativeOrder() {} -bool NativeOrder::_on_activate(log::Level level, - Price p, Quantity q, +bool NativeOrder::_on_activate(log::Level reject_level, + log::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &services, trace::CorID const &trace) { auto scoped_log = @@ -296,11 +296,12 @@ bool NativeOrder::_on_activate(log::Level level, // is our gateway connected? if (!me->services->is_gateway_connected(*me->session_services)) { - LOG(OrderMan, level, + LOG(OrderMan, reject_level, "Attempt to send order to a disconnected gateway. " "Dropping order {}", key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, "Exchange gateway is down"); + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, + "Exchange gateway is down"); return false; } @@ -309,13 +310,13 @@ bool NativeOrder::_on_activate(log::Level level, UserID(me->definition.user_id()), AccountID(me->definition.account_id())); if (!lqr.ok) { - LOG(OrderMan, level, + LOG(OrderMan, reject_level, "Unauthorized order attempted. User: {} on " "Account: {}. Msg: {} Order: {}. Dropping order", me->definition.user(), me->definition.account(), lqr.error_msg, key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, fmt::format("Unauthorized order: {}", lqr.error_msg)); return false; } @@ -326,24 +327,24 @@ bool NativeOrder::_on_activate(log::Level level, q); if (!lqr.ok) { - LOG(OrderMan, level, + LOG(OrderMan, reject_level, "New order would breach limit. User: {} Account: " "{} Msg: {} Order: {}. Dropping order", me->definition.user(), me->definition.account(), lqr.error_msg, key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, fmt::format("Order would breach limit: {}", lqr.error_msg)); return false; } // are we under the messaging threshold? if (!me->services->governor(*me->session_services).can_send()) { - LOG(OrderMan, level, + LOG(OrderMan, reject_level, "New order would cause breach of messaging " "limits. Dropping order {}", key().value()); - transition(ORDER_STATUS_REJECTED_BY_SPARK, + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, "Messaging threshold breached"); return false; } @@ -392,7 +393,7 @@ void NativeOrder::warm_up_activate(OrderServicesData &data, bts_assert(!me->services); me->services = &services; init_order_services(data, services); - _on_activate(NoLog,Price(0), Quantity(0), services, trace::CorID{}); + _on_activate(NoLog, NoLog, Price(0), Quantity(0), services, trace::CorID{}); me->services->unsubscribe_from_exe_report(*me->session_services, me->exe_report_sid); @@ -412,7 +413,7 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: // this is a brand new order - if (_on_activate(Warn,p, q, services, trace)) { + if (_on_activate(Warn, Info, p, q, services, trace)) { me->services->queue_fix(*me->session_services, jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); @@ -1045,20 +1046,28 @@ bool NativeOrder::has_exchange_order_id() { return get_native_state(me->state).exchange_order_id().size(); } -void NativeOrder::transition(api::orderman::OrderStatus new_status, +void NativeOrder::transition(log::Level level, + api::orderman::OrderStatus new_status, std::string const &msg) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); - LOG(OrderMan, Info, "Transitioning order {} from {} to {}. Msg: {}", - key().value(), from, to, msg); + if (me->state.status() != new_status) { + LOG(OrderMan, level, "Transitioning order {} from {} to {}. Msg: {}", + key().value(), from, to, msg); + } me->state.set_status(new_status); me->state.set_last_msg(msg); } +void NativeOrder::transition(api::orderman::OrderStatus new_status, + std::string const &msg) { + transition(Info, new_status, msg); +} + void NativeOrder::transition(api::orderman::OrderStatus new_status) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); - if (from != to) + if (me->state.status() != new_status) LOG(OrderMan, Info, "Transitioning order {} from {} to {}", key().value(), from, to); else From deaf8b6ad522f17e5692ea496b7814ef31e4edf3 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 28 Feb 2019 15:58:11 -0500 Subject: [PATCH 6/6] Somehow did not push this in. --- src/lib/orderman/orders/NativeOrder.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index a3465e7b0..6976a0bab 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -32,14 +32,14 @@ class NativeOrder : public Order { void on_init_from_exe_report(ExecutionReport const &, const PreActivationOrderServices &); -protected: - void warm_up_activate(OrderServicesData &,OrderServices&) override; - + protected: + void warm_up_activate(OrderServicesData &, OrderServices &) override; + private: struct PImpl; std::unique_ptr me; - bool _on_activate(log::Level log_level, + bool _on_activate(log::Level reject_level, log::Level transition_level, Price, Quantity, bts::orderman::OrderServices &, trace::CorID const &); void on_exe_report(const NewExecutionReportEvent &); @@ -50,6 +50,8 @@ protected: void init_fix(); void add_exchange_order_id_to_fix(); + void transition(log::Level level, api::orderman::OrderStatus new_state, + std::string const &msg); void transition(api::orderman::OrderStatus new_state, std::string const &msg); void transition(api::orderman::OrderStatus new_state);