From f6b98e949d83a39bb5b00ddd2c30003754eceb0f Mon Sep 17 00:00:00 2001 From: vlad zverzhkhovskiy Date: Thu, 28 Aug 2025 16:17:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B5=D0=BC=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D1=81=20=D0=B1=D0=B8=D1=80=D0=B6=D0=B8=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20env=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KLHZ.Trader.Core/Exchange/ExchangeConfig.cs | 1 + KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs | 8 ++++++-- KLHZ.Trader.Service/appsettings.json | 1 + build-docker-compose.yml | 3 ++- docker-compose.yml | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/KLHZ.Trader.Core/Exchange/ExchangeConfig.cs b/KLHZ.Trader.Core/Exchange/ExchangeConfig.cs index 5aeae41..b3b4484 100644 --- a/KLHZ.Trader.Core/Exchange/ExchangeConfig.cs +++ b/KLHZ.Trader.Core/Exchange/ExchangeConfig.cs @@ -2,6 +2,7 @@ { public class ExchangeConfig { + public bool ExchangeDataRecievingEnabled { get; set; } public decimal FutureComission { get; set; } public decimal ShareComission { get; set; } public decimal AccountCashPart { get; set; } diff --git a/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs b/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs index 5a3fa95..e2a445e 100644 --- a/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs +++ b/KLHZ.Trader.Core/Exchange/Services/ExchangeDataReader.cs @@ -24,11 +24,12 @@ namespace KLHZ.Trader.Core.Exchange.Services private readonly IDbContextFactory _dbContextFactory; private readonly CancellationTokenSource _cts = new(); private readonly IDataBus _eventBus; - + private readonly bool _exchangeDataRecievingEnabled; public ExchangeDataReader(InvestApiClient investApiClient, IDataBus eventBus, IOptions options, IDbContextFactory dbContextFactory, ILogger logger) { + _exchangeDataRecievingEnabled = options.Value.ExchangeDataRecievingEnabled; _eventBus = eventBus; _dbContextFactory = dbContextFactory; _investApiClient = investApiClient; @@ -71,7 +72,10 @@ namespace KLHZ.Trader.Core.Exchange.Services { try { - await SubscribePrices(); + if (_exchangeDataRecievingEnabled) + { + await SubscribePrices(); + } await Task.Delay(1000); //await SubscribeCandles(); } diff --git a/KLHZ.Trader.Service/appsettings.json b/KLHZ.Trader.Service/appsettings.json index 52789be..e48f767 100644 --- a/KLHZ.Trader.Service/appsettings.json +++ b/KLHZ.Trader.Service/appsettings.json @@ -8,6 +8,7 @@ }, "LokiUrl": "", "ExchangeConfig": { + "ExchangeDataRecievingEnabled": true, "Token": "", "ManagingAccountNamePatterns": [ "автотрейд 1" ], "AllowedInstrumentsFigis": [ "BBG004730N88", "FUTIMOEXF000" ], diff --git a/build-docker-compose.yml b/build-docker-compose.yml index f866275..0b1718b 100644 --- a/build-docker-compose.yml +++ b/build-docker-compose.yml @@ -11,4 +11,5 @@ services: LokiUrl: "loki:3100" TgBotConfig__Token: "${TG_BOT_TOKEN}" ExchangeConfig__Token: "${EXCHANGE_API_TOKEN}" - ConnectionStrings__PostgresConnection: "${PG_CONNECTION_STRING}" \ No newline at end of file + ConnectionStrings__PostgresConnection: "${PG_CONNECTION_STRING}" + ExchangeConfig__ExchangeDataRecievingEnabled: "${PRICES_RECIEVING_ENABLED}" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ac074a2..f603930 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: TgBotConfig__Token: "${TG_BOT_TOKEN}" ExchangeConfig__Token: "${EXCHANGE_API_TOKEN}" ConnectionStrings__PostgresConnection: "${PG_CONNECTION_STRING}" + ExchangeConfig__ExchangeDataRecievingEnabled: "${PRICES_RECIEVING_ENABLED}" # postgresql: # ports: