diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs
index 2b84f838..4f6d790f 100644
--- a/IOB-MAN/IOBManPanel.cs
+++ b/IOB-MAN/IOBManPanel.cs
@@ -430,6 +430,7 @@ namespace IOB_MAN
}
finally
{
+ checkRunning = false;
if (hasLock)
{
Monitor.Exit(_locker);
@@ -743,9 +744,9 @@ namespace IOB_MAN
private void forceCheckTimer_Tick(object sender, EventArgs e)
{
+#if false
if (!checkRunning)
{
- //checkProcessStatusAsync();
try
{
Task result = checkProcessStatusAsync();
@@ -756,6 +757,21 @@ namespace IOB_MAN
Logging.Instance.Error($"forceCheckTimer_Tick {exc}");
}
}
+#endif
+
+ if (!checkRunning)
+ {
+ try
+ {
+ Task result = Task.Run(() => checkProcessStatusAsync().ConfigureAwait(false));
+ result.Wait();
+ }
+ catch (Exception exc)
+ {
+ Logging.Instance.Error($"forceCheckTimer_Tick {exc}");
+ }
+ }
+
checkWatchdog();
// riavvio i timer x sicurezza...
UI_Timer.Stop();
@@ -950,13 +966,14 @@ namespace IOB_MAN
///
private void MainTimer_Tick(object sender, EventArgs e)
{
- //MainTimer.Stop();
if (!checkRunning)
{
- //checkProcessStatusAsync();
try
{
- Task result = checkProcessStatusAsync();
+ //Task result = checkProcessStatusAsync();
+ //result.Wait();
+
+ Task result = Task.Run(() => checkProcessStatusAsync().ConfigureAwait(false));
result.Wait();
}
catch (Exception exc)
@@ -964,7 +981,6 @@ namespace IOB_MAN
Logging.Instance.Error($"MainTimer_Tick {exc}");
}
}
- //MainTimer.Start();
}
///
@@ -1148,10 +1164,8 @@ namespace IOB_MAN
private void UI_Timer_Tick(object sender, EventArgs e)
{
- //UI_Timer.Stop();
Task result = updateProgBarAsync();
result.Wait();
- //UI_Timer.Start();
}
private void updateIOBWINToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/IOB-MAN/NLog.config b/IOB-MAN/NLog.config
index 7a0f3aa1..ff4a5d80 100644
--- a/IOB-MAN/NLog.config
+++ b/IOB-MAN/NLog.config
@@ -6,36 +6,75 @@
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
-
-
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 911831b8..819e8dbc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=754']) {
+ withEnv(['NEXT_BUILD_NUMBER=755']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'