fix: 修复 CachedStorage 的 WatchDog 代码错误

SaltWood-Studio · May 26, 2024 · 7b8c809 · 7b8c809
1 parent 090cd77
commit 7b8c809
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CSharp-OpenBMCLAPI/Modules/Cluster.cs b/CSharp-OpenBMCLAPI/Modules/Cluster.cs
@@ -390,7 +390,7 @@ await socket.EmitAsync("keep-alive",
 
         private void _keepAliveMessageParser(SocketIOResponse resp)
         {
-            Debugger.Break();
+
         }
 
         /// <summary>
@@ -655,6 +655,8 @@ public async Task RequestCertification()
             }
             string certPath = Path.Combine(ClusterRequiredData.Config.clusterWorkingDirectory, $"certifications/cert.pem");
             string keyPath = Path.Combine(ClusterRequiredData.Config.clusterWorkingDirectory, $"certifications/key.pem");
+            string pfxPath = Path.Combine(ClusterRequiredData.Config.clusterWorkingDirectory, $"certifications/cert.pfx");
+            if (File.Exists(pfxPath)) File.Delete(pfxPath);
             Directory.CreateDirectory(Path.Combine(ClusterRequiredData.Config.clusterWorkingDirectory, $"certifications"));
             await socket.EmitAsync("request-cert", (SocketIOResponse resp) =>
             {

diff --git a/CSharp-OpenBMCLAPI/Modules/Storage/CachedStorage.cs b/CSharp-OpenBMCLAPI/Modules/Storage/CachedStorage.cs
@@ -153,9 +153,9 @@ public void Initialize()
         public void MemoryWatchdog()
         {
             double memory = GetCachedMemory();
-            if (memory > 0 && memory > ClusterRequiredData.Config.maxCachedMemory)
+            if (memory > 0 && memory > ClusterRequiredData.Config.maxCachedMemory * 1048576)
             {
-                Logger.Instance.LogWarn($"缓存存储已大于 {ClusterRequiredData.Config.maxCachedMemory}（当前 {memory}），已开始清理缓存");
+                Logger.Instance.LogWarn($"缓存存储已大于 {ClusterRequiredData.Config.maxCachedMemory}（当前 {memory / 1048576}），已开始清理缓存");
                 int count = 0;
                 do
                 {