From 0f71990dc60af6e96c9f4c2f2095ca6711e2c870 Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期一, 06 七月 2020 11:29:37 +0800 Subject: [PATCH] merge --- src/Bro.Process/ProcessControl.cs | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs index ece460d..948b3c0 100644 --- a/src/Bro.Process/ProcessControl.cs +++ b/src/Bro.Process/ProcessControl.cs @@ -520,6 +520,9 @@ return; } + if (!ProcessInvokePreCheck()) + return; + IOperationConfig config = monitorSet.OpConfig; object res = null; int reTryTimes = config.ReTryTimes; @@ -578,6 +581,8 @@ } LogAsync(DateTime.Now, methodCode + "寮傚父淇℃伅", ex.GetExceptionMessage()); + + ExceptionRaisedInMonitor(ex); } } @@ -600,6 +605,23 @@ sw.Stop(); LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", ""); TimeRecordCSV(DateTime.Now, device.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds); + } + + /// <summary> + /// 娴佺▼鎵ц鐨勯妫�鏌� + /// </summary> + /// <returns></returns> + public virtual bool ProcessInvokePreCheck() + { + return true; + } + + /// <summary> + /// 鐩戝惉娴佺▼涓紓甯告姏鍑� 鍦ㄥ叿浣撲笟鍔′腑鍏蜂綋澶勭悊 + /// </summary> + /// <param name="ex">鐩戝惉娴佺▼涓紓甯稿璞�</param> + public virtual void ExceptionRaisedInMonitor(Exception ex) + { } #endregion @@ -698,6 +720,11 @@ OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null); } + + public virtual void RaisedAlarm(string alarmMsg) + { + OnAlarmUpdate?.Invoke(alarmMsg); + } #endregion #region ILogger -- Gitblit v1.8.0