Merge branch 'develop'

IOB-WIN/IobMTC.cs

@@ -41,7 +41,7 @@ namespace IOB_WIN
     /// <summary>
     /// Ultimo current received x gestione update periodico...
     /// </summary>
-    protected DateTime lastCurrent = DateTime.Now.AddMinutes(-1);
+    protected DateTime lastCurrent = DateTime.Now;
     /// <summary>
     /// Abilitazione restart (da opt par...)
     /// </summary>
@@ -92,8 +92,10 @@ namespace IOB_WIN
         bool.TryParse(getOptPar("ENABLE_MTC_RESTART"), out enableMtcRestart);
       }
       // init datetime counters
-      lastPzCountSend = DateTime.Now;
-      lastWarnODL = DateTime.Now;
+      DateTime adesso = DateTime.Now;
+      lastPzCountSend = adesso;
+      lastWarnODL = adesso;
+      lastCurrent = adesso;
     }
     /// <summary>
     /// Processo i task richiesti e li elimino dalla coda 1:1
@@ -240,6 +242,12 @@ namespace IOB_WIN
         Thread.Sleep(1000);
         MTC_ref.Start();
         esitoLink = 1;
+
+        // fix tempi!
+        DateTime adesso = DateTime.Now;
+        lastPzCountSend = adesso;
+        lastWarnODL = adesso;
+        lastCurrent = adesso;
       }
       catch
       { }
@@ -1080,7 +1088,7 @@ namespace IOB_WIN
             // stop...
             lgInfo("Fermato MTC_ref per mancanza dati current");
             MTC_ref.Stop();
-            Thread.Sleep(2000);
+            Thread.Sleep(1000);
             // restart
             lgInfo("Riavviato MTC_ref per mancanza dati current");
             MTC_ref.Start();

Jenkinsfile

@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=569']) {
+        withEnv(['NEXT_BUILD_NUMBER=570']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'