Phase 4.5: Startup-Reihenfolge-Fix (State-Hydration vor Trading-Services)
- Neuer StartupHydrationService (IHostedService), als ERSTER HostedService registriert: hydriert Accounts (+ Demo-Positionen via Repos) und Trader (trackers-Collection) in den TradingState, bevor die Trading-Services ihre ExecuteAsync starten. - frm_main.LoadDatabaseAndState() + beide Aufrufe entfernt (verhinderte doppelte, überschreibende Hydration nach Service-Start). - Behebt den Race, bei dem Services gegen leeren State anliefen. - Build 0 Fehler. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -72,6 +72,9 @@ internal static class Program
|
|||||||
services.AddSingleton<ThreemaService>();
|
services.AddSingleton<ThreemaService>();
|
||||||
services.AddSingleton<JobManager>();
|
services.AddSingleton<JobManager>();
|
||||||
services.AddSingleton<TraderMonitorService>();
|
services.AddSingleton<TraderMonitorService>();
|
||||||
|
// MUSS als erster HostedService laufen: hydriert den State, bevor die
|
||||||
|
// Trading-Services (unten) gegen einen leeren State anlaufen.
|
||||||
|
services.AddHostedService<StartupHydrationService>();
|
||||||
services.AddHostedService((IServiceProvider sp) => sp.GetRequiredService<TraderMonitorService>());
|
services.AddHostedService((IServiceProvider sp) => sp.GetRequiredService<TraderMonitorService>());
|
||||||
services.AddHostedService<CopyTradingEngine>();
|
services.AddHostedService<CopyTradingEngine>();
|
||||||
services.AddHostedService<AlchemyWebsocketService>();
|
services.AddHostedService<AlchemyWebsocketService>();
|
||||||
|
|||||||
+4
-25
@@ -342,7 +342,6 @@ namespace PolyTraderSharp
|
|||||||
dgv_jobs.DataSource = _jobManager.Jobs;
|
dgv_jobs.DataSource = _jobManager.Jobs;
|
||||||
|
|
||||||
this.FormClosing += Frm_main_FormClosing;
|
this.FormClosing += Frm_main_FormClosing;
|
||||||
LoadDatabaseAndState();
|
|
||||||
|
|
||||||
// Setup Terminal Filter
|
// Setup Terminal Filter
|
||||||
cb_terminalLogLevel.Items.Clear();
|
cb_terminalLogLevel.Items.Clear();
|
||||||
@@ -503,8 +502,7 @@ namespace PolyTraderSharp
|
|||||||
btn_vpnConnect.Click += async (s, ev) => await _vpnService.ConnectAsync();
|
btn_vpnConnect.Click += async (s, ev) => await _vpnService.ConnectAsync();
|
||||||
btn_vpndisconnect.Click += async (s, ev) => await _vpnService.DisconnectAsync();
|
btn_vpndisconnect.Click += async (s, ev) => await _vpnService.DisconnectAsync();
|
||||||
|
|
||||||
// Default Inactive overriding snapshot
|
// Default Inactive overriding snapshot (State-Hydration erfolgt im StartupHydrationService)
|
||||||
LoadDatabaseAndState();
|
|
||||||
_tradingState.LiveTradingMode = TradingMode.Inactive;
|
_tradingState.LiveTradingMode = TradingMode.Inactive;
|
||||||
_tradingState.DemoTradingMode = TradingMode.Inactive;
|
_tradingState.DemoTradingMode = TradingMode.Inactive;
|
||||||
UpdateToggleButtons();
|
UpdateToggleButtons();
|
||||||
@@ -964,28 +962,9 @@ namespace PolyTraderSharp
|
|||||||
FormatTradeGrid(dgv_closedTrades);
|
FormatTradeGrid(dgv_closedTrades);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadDatabaseAndState()
|
// Hydration des TradingState erfolgt jetzt zentral im StartupHydrationService
|
||||||
{
|
// (läuft vor den Trading-Services). Die frühere LoadDatabaseAndState()-Methode
|
||||||
var accountsCol = _db.GetCollection<AccountState>("accounts");
|
// wurde entfernt, um doppelte/überschreibende Hydration zu vermeiden.
|
||||||
var tradersCol = _db.GetCollection<TrackedTrader>("trackers");
|
|
||||||
|
|
||||||
var allAccounts = accountsCol.LiteFindAll().ToList();
|
|
||||||
foreach (var acc in allAccounts)
|
|
||||||
{
|
|
||||||
if (acc.IsDemo)
|
|
||||||
{
|
|
||||||
var demoPosCol = _db.GetCollection<Position>($"demo_positions_{acc.AccountId}");
|
|
||||||
foreach (var pos in demoPosCol.LiteFindAll())
|
|
||||||
{
|
|
||||||
acc.OpenPositions.TryAdd(pos.TokenId, pos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_tradingState.Accounts[acc.AccountId] = acc;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var trd in tradersCol.LiteFindAll())
|
|
||||||
_tradingState.Traders[trd.Id] = trd;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetupTraderManagementUI()
|
private void SetupTraderManagementUI()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
using MongoDB.Driver;
|
||||||
|
using PolyTrader.Core.Persistence;
|
||||||
|
using PolyTraderSharp.Models;
|
||||||
|
|
||||||
|
namespace PolyTraderSharp.Services
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Hydriert den TradingState (Accounts, Demo-Positionen, Trader) EINMALIG beim App-Start.
|
||||||
|
/// Registriert als erster IHostedService, damit die Hydration abgeschlossen ist, bevor die
|
||||||
|
/// Trading-BackgroundServices (TraderMonitor, CopyTradingEngine, ...) ihre ExecuteAsync
|
||||||
|
/// starten. Behebt den Startup-Race, bei dem Services gegen einen leeren State anliefen
|
||||||
|
/// (früher lag diese Logik in frm_main.LoadDatabaseAndState und lief erst NACH AppHost.Start()).
|
||||||
|
/// </summary>
|
||||||
|
public class StartupHydrationService : IHostedService
|
||||||
|
{
|
||||||
|
private readonly TradingState _state;
|
||||||
|
private readonly IAccountRepository _accountRepo;
|
||||||
|
private readonly IPositionRepository _positionRepo;
|
||||||
|
private readonly IMongoDatabase _db;
|
||||||
|
private readonly TerminalLogger _logger;
|
||||||
|
|
||||||
|
public StartupHydrationService(
|
||||||
|
TradingState state,
|
||||||
|
IAccountRepository accountRepo,
|
||||||
|
IPositionRepository positionRepo,
|
||||||
|
IMongoDatabase db,
|
||||||
|
TerminalLogger logger)
|
||||||
|
{
|
||||||
|
_state = state;
|
||||||
|
_accountRepo = accountRepo;
|
||||||
|
_positionRepo = positionRepo;
|
||||||
|
_db = db;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
foreach (var acc in _accountRepo.GetAll())
|
||||||
|
{
|
||||||
|
if (acc.IsDemo)
|
||||||
|
{
|
||||||
|
foreach (var pos in _positionRepo.GetDemo(acc.AccountId))
|
||||||
|
{
|
||||||
|
acc.OpenPositions.TryAdd(pos.TokenId, pos);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_state.Accounts[acc.AccountId] = acc;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trader (TrackedTrader) sind aktuell noch modulnah; bis zum Trader-Repo in
|
||||||
|
// Phase 5 direkt aus der "trackers"-Collection geladen.
|
||||||
|
var tradersCol = _db.GetCollection<TrackedTrader>("trackers");
|
||||||
|
foreach (var trd in tradersCol.Find(_ => true).ToList())
|
||||||
|
{
|
||||||
|
_state.Traders[trd.Id] = trd;
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.Info($"Startup-Hydration abgeschlossen: {_state.Accounts.Count} Accounts, {_state.Traders.Count} Trader geladen.");
|
||||||
|
}
|
||||||
|
catch (System.Exception ex)
|
||||||
|
{
|
||||||
|
_logger.Error($"Startup-Hydration fehlgeschlagen: {ex.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user