Fix startup

eulynx-live · Dec 18, 2023 · 099cf68 · 099cf68
1 parent dc8d070
commit 099cf68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/Point/Point.cs b/src/Point/Point.cs
@@ -34,15 +34,13 @@ public partial class Point : BackgroundService, IPoint
 
         private readonly ILogger<Point> _logger;
         private readonly IConnectionProvider _connectionProvider;
-        private readonly Func<Task> _simulateTimeout;
         private readonly PointConfiguration _config;
 
-        public Point(ILogger<Point> logger, IConfiguration configuration, IPointToInterlockingConnection connection, IConnectionProvider connectionProvider, Func<Task> simulateTimeout, IHubContext<StatusHub> statusHub)
+        public Point(ILogger<Point> logger, IConfiguration configuration, IPointToInterlockingConnection connection, IConnectionProvider connectionProvider, IHubContext<StatusHub> statusHub)
         {
             Connection = connection;
             _connectionProvider = connectionProvider;
             _logger = logger;
-            _simulateTimeout = simulateTimeout;
 
             _config = configuration.GetSection("PointSettings").Get<PointConfiguration>() ?? throw new Exception("No configuration provided");
             AllPointMachinesCrucial = _config.AllPointMachinesCrucial;
@@ -338,7 +336,6 @@ private async Task HandleCommandedPointPosition(GenericPointPosition commandedPo
             {
                 _logger.LogInformation("Timeout");
                 await Connection.SendTimeoutMessage();
-                await _simulateTimeout();
             }
             else
             {

diff --git a/src/Point/Startup.cs b/src/Point/Startup.cs
@@ -38,19 +38,15 @@ public void ConfigureServices(IServiceCollection services)
 
             try
             {
-                services.AddSingleton(x =>
-                {
-                    var simulateTimout = async () => await Task.Delay(new Random().Next(1, 5) * 1000);
-                    return ActivatorUtilities.CreateInstance<Point>(x, simulateTimout);
-                });
-                services.AddSingleton(x => x.GetRequiredService<Point>());
+                services.AddSingleton<Point>();
             }
             catch (Exception e)
             {
                 Console.WriteLine($"Usage: --PointSettings:LocalId=<> --PointSettings:LocalRastaId=<> --PointSettings:RemoteId=<> --PointSettings:RemoteEndpoint=<>. {e.Message}");
                 Environment.Exit(1);
             }
 
+            services.AddSingleton<IPoint>(x => x.GetRequiredService<Point>());
             _ = services.AddHostedService(provider => provider.GetRequiredService<Point>());
         }