|
@@ -81,7 +81,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
_runnerState = RState.Running;
|
|
|
_subState = RState.End;
|
|
|
_stopwatch.Restart();
|
|
|
- Notify("开始");
|
|
|
+ Notify("Start");
|
|
|
return _runnerState;
|
|
|
}
|
|
|
public RState Start(string module, string name)
|
|
@@ -94,7 +94,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
_subState = RState.End;
|
|
|
_stopwatch.Restart();
|
|
|
|
|
|
- Notify("开始");
|
|
|
+ Notify("Start");
|
|
|
return _runnerState;
|
|
|
}
|
|
|
/// <summary>
|
|
@@ -142,7 +142,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
}
|
|
|
else if(_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时",error);
|
|
|
+ Alarm($"Step:{id} timeout",error);
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -249,7 +249,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时", error);
|
|
|
+ Alarm($"Step:{id} timeout", error);
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -343,7 +343,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (condition())
|
|
|
{
|
|
|
- Notify($"结束");
|
|
|
+ Notify($"End");
|
|
|
_runnerState = RState.End;
|
|
|
_subState = RState.End;
|
|
|
}
|
|
@@ -351,7 +351,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (_subStepTimer.ElapsedMilliseconds > timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时");
|
|
|
+ Alarm($"Step:{id} timeout");
|
|
|
_runnerState = RState.Failed;
|
|
|
_subState = RState.Timeout;
|
|
|
}
|
|
@@ -371,7 +371,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (_subStepTimer.ElapsedMilliseconds > delayMS)
|
|
|
{
|
|
|
- Notify($"结束");
|
|
|
+ Notify($"End");
|
|
|
_runnerState = RState.End;
|
|
|
_subState = RState.End;
|
|
|
_stopwatch.Stop();
|
|
@@ -433,7 +433,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
}
|
|
|
else if(fail())
|
|
|
{
|
|
|
- Notify($"结束");
|
|
|
+ Notify($"End");
|
|
|
_runnerState = RState.End;
|
|
|
_subState = RState.End;
|
|
|
}
|
|
@@ -463,7 +463,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
}
|
|
|
else if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时");
|
|
|
+ Alarm($"Step:{id} timeout");
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -510,7 +510,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
}
|
|
|
else if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时");
|
|
|
+ Alarm($"Step:{id} timeout");
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -551,7 +551,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时", true);
|
|
|
+ Alarm($"Step:{id} timeout", true);
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -642,7 +642,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时", true);
|
|
|
+ Alarm($"Step:{id} timeout", true);
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -680,7 +680,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
}
|
|
|
else if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时");
|
|
|
+ Alarm($"Step:{id} timeout");
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -784,7 +784,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
}
|
|
|
else if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时");
|
|
|
+ Alarm($"Step:{id} timeout");
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -816,7 +816,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时", true);
|
|
|
+ Alarm($"Step:{id} timeout", true);
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -844,7 +844,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
}
|
|
|
else if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时");
|
|
|
+ Alarm($"Step:{id} timeout");
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|
|
@@ -960,7 +960,7 @@ namespace MECF.Framework.Common.Routine
|
|
|
{
|
|
|
if (_subStepTimer.ElapsedMilliseconds >= timeout)
|
|
|
{
|
|
|
- Alarm($"Step:{id} 超时", true);
|
|
|
+ Alarm($"Step:{id} timeout", true);
|
|
|
_runnerState = _subState = RState.Timeout;
|
|
|
_subStepTimer.Reset();
|
|
|
}
|