瀏覽代碼

update logManager and remove GalilControllerCfgManager simulator log

chenkui 6 天之前
父節點
當前提交
8982c26465

+ 2 - 1
CyberX8_RT/Devices/SRD/SrdCommonDevice.cs

@@ -957,7 +957,8 @@ namespace CyberX8_RT.Devices.SRD
             else if (state == RState.Failed || state == RState.Timeout)
             {
                 LOG.WriteLog(eEvent.ERR_SRD, $"{Module}", $"{currentOperation} error");
-                EndOperation();
+                _status= RState.Failed;
+                _currentOperation= SrdCommonOperation.None;
             }
         }
         /// <summary>

+ 0 - 5
Framework/Common/Device/Galil/GalilControllerCfgManager.cs

@@ -182,11 +182,6 @@ namespace MECF.Framework.Common.Device.Galil
                     continue;
                 }
                 GalilAxisData galilAxisData=controllerData.GalilAxisDatas[index];
-
-                if (SC.GetValue<bool>("System.IsSimulatorMode"))
-                {
-                    LOG.WriteBackgroundLog(eEvent.INFO_AXIS, moduleName, JsonConvert.SerializeObject(galilAxisData));
-                }
                 CheckAxisDataChanged(moduleName, galilAxisData);
             }
         }

+ 19 - 1
Framework/Common/Log/LogManager.cs

@@ -63,7 +63,25 @@ namespace Aitex.Core.RT.Log
         {
             if (deleteTimer.Interval == 1)
             {
-                deleteTimer.Interval = 24 * 60 * 60 * 1000;//每隔24小时删除
+                deleteTimer.Interval = 60 * 1000;//每隔1分钟删除
+            }
+            else if (deleteTimer.Interval == 60 * 1000)
+            {
+                if (DateTime.Now.Hour != 0 && DateTime.Now.Minute != 0)//下一次是0点
+                {
+                    return;
+                }
+                else
+                {
+                    deleteTimer.Interval = 60 * 60 * 1000;
+                }
+            }
+            else if (deleteTimer.Interval == 60 * 60 * 1000)
+            {
+                if (DateTime.Now.Hour != 0)
+                {
+                    return;
+                }
             }
             try
             {