shayne_lo 5 ay önce
ebeveyn
işleme
84ea5eafac

+ 14 - 9
EVCB_OCPP.WSServer/ProtalServer.cs

@@ -1132,15 +1132,7 @@ namespace EVCB_OCPP.WSServer
 
         private async Task StartLateInitializeEVSE(WsClientData session)
         {
-            bool passed = false;
-            do
-            {
-                while (bootSemaphore.CurrentCount < bootReservCnt)
-                {
-                    await Task.Delay(TimeSpan.FromMinutes(2), session.DisconnetCancellationToken);
-                }
-                passed = bootSemaphore.Wait(0);
-            } while (!passed);
+            await WaitCanStartLateInitEVSE(session.DisconnetCancellationToken);
 
             try
             {
@@ -1159,6 +1151,19 @@ namespace EVCB_OCPP.WSServer
             }
         }
 
+        private async Task WaitCanStartLateInitEVSE(CancellationToken token)
+        {
+            bool passed = false;
+            do
+            {
+                while (bootSemaphore.CurrentCount < bootReservCnt)
+                {
+                    await Task.Delay(TimeSpan.FromMinutes(2), cancellationToken: token);
+                }
+                passed = bootSemaphore.Wait(0);
+            } while (!passed);
+        }
+
         private async Task LateInitializeEVSE(WsClientData session)
         {
             Func<string, CancellationToken , Task<string>> sendTask; 

+ 0 - 12
EVCB_OCPP.WSServer/Service/ConfirmWaitingMessageSerevice.cs

@@ -231,10 +231,6 @@ namespace EVCB_OCPP.WSServer.Service
             do
             {
                 message = await SendAndWaitResultAsync(startSendTaskFunc, maxWaitSec: maxWaitSec, token: token);
-                //var SerialNo = Guid.NewGuid().ToString();
-                //var waitObject = CreateAndAddWaitObject(SerialNo);
-                //await startSendTaskFunc(SerialNo, token);
-                //message = await WaitResultAsync(SerialNo, waitObject: waitObject, token: token);
             }
             while (message == null && !token.IsCancellationRequested);
             return message;
@@ -269,14 +265,6 @@ namespace EVCB_OCPP.WSServer.Service
             if (completedTask != task)
             {
                 logger.LogWarning("wait {msg} time out", serialNo);
-                //var checkResult = await mainDbService.TryGetResponseFromDb(serialNo, token);
-                //if (checkResult is not null)
-                //{
-                //    logger.LogWarning("{msg} found in db", serialNo);
-                //    return checkResult;
-                //}
-                //logger.LogWarning("{msg} not found in db", serialNo);
-                //return null;
             }
 
             asyncWaitingTasks.Remove(serialNo, out var _);