Fixed clang build.

src/client/spark_api/security/SecurityFormatter.cs

@@ -1,18 +1,18 @@
-using System;
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using static bts.api.Security;
 
 namespace bts.api {
    struct FutureLeg {
       public readonly Venue exchange;
-      public readonly string symbol;
+      public readonly string symbol, exchange_desc;
       public readonly FutureContractImmutable future;
       public readonly int quantity;
 
-      public FutureLeg(Venue exchange, string symbol, FutureContractImmutable future, int quantity) {
+      public FutureLeg(Venue exchange, string symbol, string exchange_desc, FutureContractImmutable future, int quantity) {
          this.exchange = exchange;
          this.symbol = symbol;
+         this.exchange_desc = exchange_desc;
          this.future = future;
          this.quantity = quantity;
       }
@@ -32,12 +32,14 @@ namespace bts.api {
          return string.Join("", _format_future_legs(future_legs));
       }
 
-      public static string format_future(string symbol, FutureContractImmutable future) =>
-         $"{symbol}{DateFormatter.Format(future.ExpirationYear, future.ExpirationMonth, future.ExpirationDay, DateFormat.MonthCodeLastDigitYear)}";
+      public static string format_future(string symbol, string exch_desc, FutureContractImmutable future) =>
+         string.IsNullOrEmpty(exch_desc) ?
+            $"{symbol}{DateFormatter.Format(future.ExpirationYear, future.ExpirationMonth, future.ExpirationDay, DateFormat.MonthCodeLastDigitYear)}" :
+            exch_desc;
 
       static string _format(SecurityImmutable security) {
          switch (security.ContractCase) {
-            case ContractOneofCase.Future: return format_future(security.Symbol, security.Future);
+            case ContractOneofCase.Future: return format_future(security.Symbol, security.glbx_desc(), security.Future);
             case ContractOneofCase.Spread:
                if (security.HasGlbx) {
                   // In case we ever bring it back, pretty printed spread names can be found here:
@@ -61,7 +63,7 @@ namespace bts.api {
       }
 
       static string _get_first_leg_name(FutureLeg fl) {
-         string sym_exp_name = format_future(fl.symbol, fl.future);
+         string sym_exp_name = format_future(fl.symbol, fl.exchange_desc, fl.future);
          switch (fl.quantity) {
             case 1: return sym_exp_name;
             case -1: return $"-{sym_exp_name}";
@@ -70,7 +72,7 @@ namespace bts.api {
       }
 
       static string _get_subsequent_leg_name(FutureLeg fl) {
-         string sym_exp_name = format_future(fl.symbol, fl.future);
+         string sym_exp_name = format_future(fl.symbol, fl.exchange_desc, fl.future);
          switch (fl.quantity) {
             case 1: return $"+{sym_exp_name}";
             case -1: return $"-{sym_exp_name}";

src/client/spark_api/security/SecurityHelper.cs

@@ -19,7 +19,7 @@ namespace bts.api {
          foreach (var l in legs) {
             switch (l.Security.ContractCase) {
                case ContractOneofCase.Future:
-                  yield return new FutureLeg(l.Security.Exchange, l.Security.Symbol, l.Security.Future, qty * l.SignedQuantity());
+                  yield return new FutureLeg(l.Security.Exchange, l.Security.Symbol, l.Security.glbx_desc(), l.Security.Future, qty * l.SignedQuantity());
                   break;
                case ContractOneofCase.Spread:
                   foreach (var fl in _get_flat_future_legs(l.Security.Spread.Legs, qty * l.SignedQuantity()))
@@ -56,6 +56,9 @@ namespace bts.api {
 
       public static string DisplayExchange(this SecurityImmutable security) =>
          security.ContractCase == ContractOneofCase.Synthetic ? $"[{string.Join(",", get_flat_future_legs(security).Select(flt => flt.exchange.ToString()).Distinct().OrderBy(e => e))}]" : security.Exchange.ToString();
+
+      public static string glbx_desc(this SecurityImmutable security) =>
+         security.HasGlbx ? security.Glbx.SecurityDesc ?? string.Empty : string.Empty;
       #endregion
 
       public static class Comparer {

src/lib/api/service_helpers/AdminServiceUtils.cpp

@@ -820,19 +820,49 @@ void AdminServiceUtils::delete_user (bts::api::admin::AdminData& admin_data,
 ////////////////////////////////////////////
 bool AdminServiceUtils::_sort_security_scopes (const bts::api::admin::SecurityScope& a,
                                                const bts::api::admin::SecurityScope& b){
-   if (has_id(a.security_id()))
-      return true;
+   // for both the sec and product scope sorting, the more
+   // qualified arg is sent to the top (vs wildcard). the
+   // order of qualification is sec_id, symbol, type, exchange.
+   // if both a and b are equally qualified, it is a
+   // a dont-care case (in terms of sec/prod res) and 
+   // ascending orderring is used
+   if (has_id(a.security_id())){
+      if (has_id(b.security_id()))
+         return a.security_id() < b.security_id();
+      else
+         return true;
+   }
    if (has_id(b.security_id()))
      return false;
-   if (a.security_symbol() != "*")
-      return true; 
-   return false;
+   // symbol
+   if (is_symbol_set(a.security_symbol())){
+      if (is_symbol_set(b.security_symbol()))
+         return a.security_symbol() < b.security_symbol();
+      else
+         return true;
+   }
+   if (is_symbol_set(b.security_symbol()))
+      return false;
+   // sec type
+   if (a.security_type() != b.security_type())
+      return a.security_type() < b.security_type();
+   return a.exchange() < b.exchange();
 }
 bool AdminServiceUtils::_sort_product_scopes (const bts::api::admin::ProductScope& a,
-                                              const bts::api::admin::ProductScope&){
-   if (a.security_symbol() != "*")
-      return true;
-   return false;
+                                              const bts::api::admin::ProductScope& b){
+   // symbol
+   if (is_symbol_set(a.security_symbol())){
+      if (is_symbol_set(b.security_symbol()))
+         return a.security_symbol() < b.security_symbol();
+      else
+         return true;
+   }
+   if (is_symbol_set(b.security_symbol()))
+      return false;
+   // sec type
+   if (a.security_type() != b.security_type())
+      return a.security_type() < b.security_type();
+   return a.exchange() < b.exchange();
 }
 void AdminServiceUtils::sort_limits (bts::api::admin::BTSAccount& account){
    std::sort (account.mutable_security_position_limits()->begin(),
@@ -1025,4 +1055,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
    acct_a1_clip_size->set_clip_size(100);
 }
 bool AdminServiceUtils::has_id (uint32_t id){return id>0;}
+bool AdminServiceUtils::is_symbol_set (const std::string& symbol){
+   return symbol !="*";
+}
 }}

src/lib/api/service_helpers/AdminServiceUtils.h

@@ -240,6 +240,7 @@ public:
    // misc//////// ////////////////////////////
    ////////////////////////////////////////////
    static bool has_id (uint32_t id);
+   static bool is_symbol_set (const std::string& symbol);
    static void bootstrap_data (bts::api::admin::AdminData& data);
 };
 }}

src/lib/quickbus/network/QBConnection.cpp

@@ -193,10 +193,18 @@ void QBConnection::handle_msg(msgs::QBMsg *msgs)
             me->intro=op.intro();
             me->my_id = NodeID(me->intro.node_id());
 
-            if (!me->router.add_neighbour(me->my_id,shared_from_this())) {
-               close_connection("Node is already connected");
+            if (me->router.is_neighbour(me->my_id)) {
+               LOG(QBus,Warn, "Refusing connection from {} to {} reason: {} is already connected" ,
+                   me->my_desc , me->remote_desc , me->my_id.value());
+               if (me->socket.is_open()) 
+                  me->socket.close();
                return;
             }
+            else {
+               LOG(QBus,Warn, "Accepted connection from {} to {}. {} is now connected." ,
+                   me->my_desc , me->remote_desc , me->my_id.value());
+               me->router.add_neighbour(me->my_id,shared_from_this());
+            }
          }
          break;
       }

src/lib/quickbus/routing/Router.cpp

@@ -184,6 +184,11 @@ void Router::remove_neighbour(NodeID const&removed_neighbour_id)
    me->neighbours.erase(removed_neighbour_id);
 }
 
+bool Router::is_neighbour(NodeID const&neighbour_id) const
+{
+   return me->neighbours.find(neighbour_id) != me->neighbours.end();
+}
+
 void Router::advertise(NodeID const& sender,TableID const&tid,Advertisement const&ad) 
 {
    LOG(QBus,Diag, "{} received advertisement from nid: {}  tid: {} ad topic: {}",

src/lib/quickbus/routing/Router.h

@@ -15,7 +15,8 @@ public:
    NodeID id() const ;
    bool add_neighbour (NodeID const& neighbour_id, INodePtr const& neighbour);
    void remove_neighbour (NodeID const& neighbour_id);
-
+   bool is_neighbour(NodeID const&neighbour_id) const;
+   
    // from INode 
    void advertise(NodeID const& sender,TableID const&id,Advertisement const&adv) override;
    void unadvertise(NodeID const& sender,TableID const&tid) override;

src/server/sparkd/CMakeDeps.cmake

@@ -1 +1 @@
-set(sources cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;dspark/mirage.cpp;dspark/mirage/routing/Router.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;mercury/actors/Actor.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/Line truncated
+set(sources cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage.cpp;dspark/mirage/routing/Router.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;mercury/actors/Actor.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreaderLine truncated

src/server/sparkd/cmds/Web.cpp

@@ -0,0 +1,56 @@
+#include "Web.h"
+
+#include "lib/config/config.h"
+#include "lib/config/protos/quickbus_cfg.pb.h"
+#include "lib/config/protos/Ports.pb.h"
+#include "lib/quickbus/quickbus.h"
+#include "lib/api/public/ServiceContext.h"
+
+#include "server/sparkd/metrics/metrics.h"
+#include "server/sparkd/metrics/system_metrics.h"
+#include "server/sparkd/http/WebServer.h"
+#include "lib/md/relay/QueryServer.h"
+#include "lib/md/SyntheticSecurityService.h"
+#include "server/sparkd/user/AdminServiceServer.h"
+#include "server/sparkd/user/UserServiceServer.h"
+#include "server/sparkd/md/run_md.h"
+
+#include <vector>
+#include <string>
+
+namespace bts {
+namespace cmd {
+
+int Web::execute(const std::vector<std::string>& args) {
+   config::QuickbusNodeCfg qb_cfg;
+   auto& ports = config::get<config::Ports>();
+   qb_cfg.set_my_port(ports.qbus_port());
+   qbus::Quickbus quickbus(qb_cfg);
+   api::ServiceContext sc(&quickbus);
+
+   metrics::MetricsContainer stats;
+   metrics::publish_system_metrics(stats);
+   http::SparkWebServer webserver(sc, stats, ports.config_port());
+
+   user::UserServiceServer login_server(sc);
+   if (std::find(args.begin(), args.end(), "-md") != args.end()) {
+      md::run_market_datapublishers();
+   }
+
+   std::shared_ptr<api::ISyntheticSecurityService> synthetic_service =
+       std::make_shared<api::synthetic::SyntheticSecurityService>(sc);
+   md::QueryServerPtr md_query_server(
+       md::run_query_server(sc, synthetic_service, stats));
+
+   admin::AdminServiceServer admin_service(sc);
+
+
+   
+   std::this_thread::sleep_until(
+       std::chrono::time_point<std::chrono::system_clock>::max());
+   return 0;
+}
+
+std::string Web::help() { return "\t run only the services required for the web admin.  This cannot be run concurrently with 'sparkd run'\n\tAdd -md to start market data too."; }
+
+}}//namespace

src/server/sparkd/cmds/Web.h

@@ -0,0 +1,17 @@
+
+#pragma once
+
+#include "ICmd.h"
+
+namespace bts {
+namespace cmd {
+
+class Web : public ICmd 
+{
+public:
+   int execute(std::vector<std::string> const &args);
+   std::string help ();
+};
+
+}}
+

src/server/sparkd/http/WebServer.cpp

@@ -217,11 +217,22 @@ namespace http {
          con->set_body(read_file(path.string()));
          con->set_status(websocketpp::http::status_code::ok);
       }
+
       void return_bts_installer(connection_ptr& con) {
          std::string installer_bits = read_file(_www+"/bts_installer.exe");
          const std::string installer_config = _www+"install_config.json";
          if (boost::filesystem::is_regular_file(installer_config)) {
-            installer_bits += read_file(installer_config);
+            auto conf = read_file(installer_config);
+            std::string needle = "$HOST";
+            std::size_t pos;
+            do {
+               pos = conf.find(needle,0);
+               if (pos != std::string::npos) {
+                  auto host = con->get_uri()->get_host();
+                  conf.replace(pos, needle.size(), host);
+               }
+            } while(pos != std::string::npos);
+            installer_bits += conf;
          }
          con->set_body(installer_bits);
          con->set_status(websocketpp::http::status_code::ok);

src/server/sparkd/jetfix/store/FIXFileStore.cpp

@@ -127,17 +127,6 @@ std::string store_path (std::string base_path,
    return result.string ();
 }
 
-void create_current_simlink (std::string const &path)
-{
-   auto sym_link_path = boost::filesystem::path (path);
-   sym_link_path /= "..";
-   sym_link_path /= "current";
-   if (boost::filesystem::exists (sym_link_path)) 
-      boost::filesystem::remove (sym_link_path);
-   
-   boost::filesystem::create_symlink (boost::filesystem::path (path),sym_link_path);
-}
-
 std::map<uint32_t,InMsgBuffer>
 load_replay (config::JetFIX::Connection const &cfg,std::string const&path, uint32_t max_sn)
 {
@@ -227,8 +216,6 @@ FIXFileStore::FIXFileStore (config::JetFIX::Connection const&cfg,std::string bas
          }
       }
       me->fix_store.open (fix_log_p,std::ofstream::app);
-
-      create_current_simlink (path);
       me->writer_thread = std::thread (std::bind (&FIXFileStore::write,this));
    }
 }

src/server/sparkd/main.cpp

@@ -15,6 +15,7 @@
 #include "server/sparkd/cmds/AutoCert.h"
 #include "server/sparkd/cmds/QuickTest.h"
 #include "server/sparkd/cmds/Span.h"
+#include "server/sparkd/cmds/Web.h"
 
 int main(int argc, char **argv) {
    using namespace bts;
@@ -33,6 +34,7 @@ int main(int argc, char **argv) {
    REGISTER(QuickTest);
    REGISTER(AutoCert);
    REGISTER(Span);
+   REGISTER(Web);
    END_CMD;
 
    utils::finit_spark_lib();

src/server/sparkd/metrics/metrics.h

@@ -24,6 +24,7 @@ struct Metric {
    Metric(const std::string&, const std::vector<Label>&);
    virtual void print(std::ostream&) const = 0;
    std::string str() const;
+   virtual ~Metric() {}
 };
 
 template <class T>
@@ -144,4 +145,5 @@ class MetricsContainer {
 };
 
 
-}}//namespace
+}}//namespace
+

src/server/sparkd/orderman/orders/NativeOrder.cpp

@@ -303,8 +303,7 @@ void NativeOrder::on_activate(Price p, Quantity q,
           AccountID(me->definition.account_id()));
       if (!lqr.ok) {
          LOG(OrderMan, Warn, "Unauthorized order attempted. User: {} on "
-                             "Account: {}. Msg: {} Order: {} "
-                             "Dropping order {}",
+             "Account: {}. Msg: {} Order: {}. Dropping order",
              me->definition.user(), me->definition.account(), lqr.error_msg,
              key().value());
 

src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h

@@ -133,10 +133,11 @@ private:
    void _transform_to_END(std::string* m = nullptr);
    // swtches to the state passed in the arg
    void _switch_state (ISpreaderStateWorker* new_state);
-   // this means on_init_new has been called and we have the
-   // the structure built
    // misc ////////////////////
    ////////////////////////////
+   // this means on_init_new or on_init_recovered
+   // has been called and we have the bookkeeping
+   // data built
    bool _inited () const {
       return _bookkeeping_data_ptr != nullptr;
    }

src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp

@@ -40,13 +40,16 @@ void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::Order
                                                  const SpreaderPreActivationOrderServices& spreader_pao_services)
 {
    bts_assert(!_spreader->_inited());
-   // we are not handling this yet, so lets send it directly to END
+   // we are not handling recovery, so we go directly to the end state
+   // and the status of the order to cancelled
+   bts::api::orderman::OrderRecord order_record_copy = order_record;   
+   order_record_copy.mutable_state()->set_status(bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED);
    _spreader->_bookkeeping_data_ptr = std::make_unique<SpreaderBookkeepingData>(*_spreader,
-                                                                                order_record,
+                                                                                order_record_copy,
                                                                                 spreader_pao_services,
                                                                                 std::vector<LegPropertyData>());
    LOG(OrderMan, Warn, "SpreaderStartStateWorker.on_init_recovered key: {} , going to END", _spreader->key().value());
-   std::string msg = "Recovered spreader orders and not supported";
+   std::string msg = "Recovered spreader orders (from last session) are cancelled";
    _spreader->_transform_to_END (&msg);
 }
 void SpreaderStartStateWorker::on_activate(Price price, Quantity quantity, SpreaderOrderServices& order_services){

src/server/sparkd/user/tests/admin_service_tests.cpp

@@ -268,4 +268,71 @@ TEST_CASE ("Bootstrapping", "[admin_service]")
       REQUIRE(account.connections().exchange_connection_names_size()==2);
    }
 }
+TEST_CASE("Sorting Limit","[admin_service]"){
+   bts::api::admin::AdminData admin_data;
+   bts::api::admin::AdminServiceCreateAccountResult account_result;
+   auto account = AdminServiceUtils::create_account(admin_data,
+                                                    0, 
+                                                    std::string("A"), 
+                                                    std::string("description"), 
+                                                    true,
+                                                    account_result);
+   auto l1 = account->mutable_security_clip_limits()->add_limit();
+   l1->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
+   l1->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
+   l1->mutable_security()->set_security_symbol("*");
+   l1->mutable_security()->set_security_id(0);
+   l1->set_clip_size(100);
+   auto l2 = account->mutable_security_clip_limits()->add_limit();
+   l2->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
+   l2->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
+   l2->mutable_security()->set_security_symbol("SI");
+   l2->mutable_security()->set_security_id(0);
+   l2->set_clip_size(101);
+   auto l3 = account->mutable_security_clip_limits()->add_limit();
+   l3->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
+   l3->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
+   l3->mutable_security()->set_security_symbol("CL");
+   l3->mutable_security()->set_security_id(0);
+   l3->set_clip_size(102);
+   auto l4 = account->mutable_security_clip_limits()->add_limit();
+   l4->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
+   l4->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
+   l4->mutable_security()->set_security_symbol("ZC");
+   l4->mutable_security()->set_security_id(10);
+   l4->set_clip_size(103);
+   auto l5 = account->mutable_security_clip_limits()->add_limit();
+   l5->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
+   l5->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
+   l5->mutable_security()->set_security_symbol("ZN");
+   l5->mutable_security()->set_security_id(5);
+   l5->set_clip_size(104);
+   auto l6 = account->mutable_security_clip_limits()->add_limit();
+   l6->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
+   l6->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_SPREAD);
+   l6->mutable_security()->set_security_symbol("SI");
+   l6->mutable_security()->set_security_id(0);
+   l6->set_clip_size(105);
+   // tests
+   auto sorted_admin_data = AdminServiceUtils::sort_limits(admin_data);
+   const auto& r_account = sorted_admin_data.accounts(0);
+   const auto& r_l1 = r_account.security_clip_limits().limit(0);   
+   REQUIRE(r_l1.security().security_id()==5);
+   REQUIRE(r_l1.clip_size()==104);
+   const auto& r_l2 = r_account.security_clip_limits().limit(1);
+   REQUIRE(r_l2.security().security_id()==10);
+   REQUIRE(r_l2.clip_size()==103);
+   const auto& r_l3 = r_account.security_clip_limits().limit(2);
+   REQUIRE(r_l3.security().security_symbol()=="CL");
+   REQUIRE(r_l3.clip_size()==102);
+   const auto& r_l4 = r_account.security_clip_limits().limit(3);
+   REQUIRE(r_l4.security().security_symbol()=="SI");
+   REQUIRE(r_l4.clip_size()==101);
+   const auto& r_l5 = r_account.security_clip_limits().limit(4);
+   REQUIRE(r_l5.security().security_symbol()=="SI");
+   REQUIRE(r_l5.clip_size()==105);
+   const auto& r_l6 = r_account.security_clip_limits().limit(5);
+   REQUIRE(r_l6.security().security_symbol()=="*");
+   REQUIRE(r_l6.clip_size()==100);
+}
 }}

tools/linux_control/build_in_docker.sh

@@ -1,3 +1,7 @@
 #!/bin/bash
-cid=`docker ps | grep bluetradingsystems/linux_docker | awk '{print $1}'`
-docker exec $cid /bin/bash -c "cd build/clang_debug/ && ninja"
+if [ -f /.dockerenv ]; then
+    ninja
+else
+    cid=`docker ps | grep bluetradingsystems/linux_docker | awk '{print $1}'`
+    docker exec $cid /bin/bash -c "cd build/clang_debug/ && ninja"
+fi

tools/setup_builds.sh

@@ -6,7 +6,7 @@ cd $DIR/../build/
 rm -rf clang_debug 
 mkdir clang_debug
 cd clang_debug
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=`realpath ../../tools/linux_control/rtags.sh` ../..
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CXX_COMPILER=`realpath ../../tools/linux_control/rtags.sh` ../..
 cd ..
 
 rm -rf ninja_debug
@@ -18,7 +18,7 @@ cd ..
 rm -rf ninja_release
 mkdir ninja_release
 cd ninja_release
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CXX_COMPILER=g++ ../..
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ ../..
 cd ..