From e0706dde01b9be2fd7befc619c1bf7cedb747057 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 17 Feb 2023 14:17:48 -0500 Subject: [PATCH] refactor: Move DeploymentType cfg to its own file --- src/lib/api/service_helpers/AdminServiceUtils.cpp | 2 +- src/lib/config/defaults/deployment_type.conf | 5 +++++ src/lib/config/protos/deployment_type.proto | 9 +++++++++ src/lib/config/protos/system_config.proto | 4 ---- src/lib/logging/logging.cpp | 2 +- src/lib/md/cme/MDP3Utils.cpp | 1 + src/lib/md/ice/ICEUtils.cpp | 1 + src/lib/plugin/plugin.cpp | 2 +- src/lib/utils/SecureLogon.cpp | 1 + 9 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 src/lib/config/defaults/deployment_type.conf create mode 100644 src/lib/config/protos/deployment_type.proto diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index b2ce5eb23..9d2979772 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -2,8 +2,8 @@ #include "lib/api/services/AdminService.server.pb.h" #include "lib/config/config.h" #include "lib/config/protos/cme_reference_data.pb.h" +#include "lib/config/protos/deployment_type.pb.h" #include "lib/config/protos/jetfix.pb.h" -#include "lib/config/protos/system_config.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/md/get_symbols.h" diff --git a/src/lib/config/defaults/deployment_type.conf b/src/lib/config/defaults/deployment_type.conf new file mode 100644 index 000000000..ee3e7b3c9 --- /dev/null +++ b/src/lib/config/defaults/deployment_type.conf @@ -0,0 +1,5 @@ +DeploymentType { + value { + type: "dev" + } +} diff --git a/src/lib/config/protos/deployment_type.proto b/src/lib/config/protos/deployment_type.proto new file mode 100644 index 000000000..4aa5279b9 --- /dev/null +++ b/src/lib/config/protos/deployment_type.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package bts.config; + +option csharp_namespace = "bts.config"; + +message DeploymentType { + string type = 1; +} diff --git a/src/lib/config/protos/system_config.proto b/src/lib/config/protos/system_config.proto index 94dd3e01a..b50435028 100644 --- a/src/lib/config/protos/system_config.proto +++ b/src/lib/config/protos/system_config.proto @@ -34,7 +34,3 @@ message ConfigProto { message ConfigIntrospection { repeated ConfigProto config = 1; } - -message DeploymentType { - string type = 1; -} diff --git a/src/lib/logging/logging.cpp b/src/lib/logging/logging.cpp index cc8f88913..ab2f8c161 100644 --- a/src/lib/logging/logging.cpp +++ b/src/lib/logging/logging.cpp @@ -2,8 +2,8 @@ #include "LoggerHub.h" #include "lib/config/config.h" +#include "lib/config/protos/deployment_type.pb.h" #include "lib/config/protos/logging.pb.h" -#include "lib/config/protos/system_config.pb.h" #include "lib/os/os.h" #include "lib/utils/Dispatcher.h" #include "lib/utils/bts_assert.h" diff --git a/src/lib/md/cme/MDP3Utils.cpp b/src/lib/md/cme/MDP3Utils.cpp index 9036e5faa..8e4677be1 100644 --- a/src/lib/md/cme/MDP3Utils.cpp +++ b/src/lib/md/cme/MDP3Utils.cpp @@ -8,6 +8,7 @@ #include "lib/utils/datetime.h" #include "lib/utils/download.h" +#include "lib/config/protos/deployment_type.pb.h" #include "lib/config/protos/market_data.pb.h" #include "lib/config/protos/system_config.pb.h" diff --git a/src/lib/md/ice/ICEUtils.cpp b/src/lib/md/ice/ICEUtils.cpp index 9a5154838..2bc2d0102 100644 --- a/src/lib/md/ice/ICEUtils.cpp +++ b/src/lib/md/ice/ICEUtils.cpp @@ -8,6 +8,7 @@ #include "lib/utils/datetime.h" #include "lib/utils/download.h" +#include "lib/config/protos/deployment_type.pb.h" #include "lib/config/protos/market_data.pb.h" #include "lib/config/protos/system_config.pb.h" diff --git a/src/lib/plugin/plugin.cpp b/src/lib/plugin/plugin.cpp index c07d188fb..b255bbcfe 100644 --- a/src/lib/plugin/plugin.cpp +++ b/src/lib/plugin/plugin.cpp @@ -1,5 +1,5 @@ #include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" +#include "lib/config/protos/deployment_type.pb.h" #include "lib/logging/logging.h" #include "lib/orderman/OrderBuilder.h" #include "lib/plugin/SparkServices.h" diff --git a/src/lib/utils/SecureLogon.cpp b/src/lib/utils/SecureLogon.cpp index 8316e1a27..a5d3760b7 100644 --- a/src/lib/utils/SecureLogon.cpp +++ b/src/lib/utils/SecureLogon.cpp @@ -3,6 +3,7 @@ #ifndef BTS_EDGE #include "lib/config/config.h" +#include "lib/config/protos/deployment_type.pb.h" #include "lib/config/protos/system_config.pb.h" #include "lib/utils/bts_assert.h" #include "lib/utils/datetime.h"