opti: 添加 WantEnable 字段以实现重试逻辑

SaltWood-Studio · Mar 30, 2024 · 6bc72a3 · 6bc72a3
1 parent d96795f
commit 6bc72a3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/CSharp-OpenBMCLAPI/Modules/Cluster.cs b/CSharp-OpenBMCLAPI/Modules/Cluster.cs
@@ -35,6 +35,7 @@ public class Cluster : RunnableBase
         public Guid guid;
         private SocketIOClient.SocketIO socket;
         public bool IsEnabled { get; set; }
+        public bool WantEnable { get; set; }
         private Task? _keepAlive;
         protected IStorage storage;
         protected AccessCounter counter;
@@ -174,9 +175,7 @@ private void InitializeService()
             application.MapGet("/measure/{size}", (context) => HttpServiceProvider.LogAndRun(context,
                 () => HttpServiceProvider.Measure(context).Wait()
             ));
-            application.MapPost("/api/{name}", (HttpContext context, string name) => HttpServiceProvider.LogAndRun(context,
-                () => HttpServiceProvider.Api(context, name, this).Wait()
-            ));
+            application.MapPost("/api/{name}", (HttpContext context, string name) => HttpServiceProvider.Api(context, name, this).Wait());
             application.MapGet("/", (context) => HttpServiceProvider.LogAndRun(context,
             () =>
             {
@@ -232,6 +231,11 @@ public void Connect()
             {
                 SharedData.Logger.LogWarn($"与主控断开连接：{r}");
                 this.IsEnabled = false;
+                if (this.WantEnable)
+                {
+                    this.Connect();
+                    this.Enable().Wait();
+                }
             });
         }
 
@@ -249,6 +253,7 @@ public async Task Enable()
             await socket.EmitAsync("enable", (SocketIOResponse resp) =>
             {
                 this.IsEnabled = true;
+                this.WantEnable = true;
                 Utils.PrintResponseMessage(resp);
                 // Debugger.Break();
                 SharedData.Logger.LogSystem($"启用成功");
@@ -285,6 +290,10 @@ await socket.EmitAsync("disable", (SocketIOResponse resp) =>
                 SharedData.Logger.LogSystem($"禁用成功");
                 this.IsEnabled = false;
             });
+            if (this.WantEnable)
+            {
+                await this.Enable();
+            }
         }
 
         /// <summary>

diff --git a/CSharp-OpenBMCLAPI/Modules/Statistician/DataStatistician.cs b/CSharp-OpenBMCLAPI/Modules/Statistician/DataStatistician.cs
@@ -131,7 +131,7 @@ public int Connections
             get
             {
                 IPGlobalProperties properti = IPGlobalProperties.GetIPGlobalProperties();
-                var tcps = properti.GetActiveTcpConnections().ToList();
+                var tcps = properti.GetActiveTcpConnections();
 
                 var list = tcps.Where(f => f.LocalEndPoint.Port == SharedData.Config.PORT);
 

diff --git a/CSharp-OpenBMCLAPI/Modules/Utils.cs b/CSharp-OpenBMCLAPI/Modules/Utils.cs
@@ -70,6 +70,7 @@ public static void PrintJsonElement(JsonElement element)
         /// <returns></returns>
         public static async Task ExitCluster(Cluster cluster)
         {
+            cluster.WantEnable = false;
             cluster.cancellationSrc.Cancel();
             await cluster.KeepAlive();
             Thread.Sleep(1000);