diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config index 7d715e14..9790b837 100644 --- a/IOB-MAN/App.config +++ b/IOB-MAN/App.config @@ -6,9 +6,9 @@ - - - + + + diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index a9257b22..e6b78a62 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -68,6 +68,10 @@ namespace IOB_MAN /// Contatore autockeck nativo /// protected int tOutAutocheck = 100; + /// + /// semaforo check... + /// + protected bool checkRunning = false; public IOBManPanel() { InitializeComponent(); @@ -352,8 +356,14 @@ namespace IOB_MAN private void MainTimer_Tick(object sender, EventArgs e) { updateProgBar(); - chekProcessStatusAsync(); - checkWatchdog(); + if (!checkRunning) + { + chekProcessStatusAsync(); + checkWatchdog(); + } + else + { + } } /// /// Controllo periodico dei processi DA RIATTIVARE @@ -419,8 +429,10 @@ namespace IOB_MAN chekMult--; if (chekMult < 0) { + checkRunning = true; chekMult = utils.CRI("chekMult"); await Task.Run(() => checkRunningchild()); + checkRunning = false; } } diff --git a/Jenkinsfile b/Jenkinsfile index 9ef12a56..ef0bb8ae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=658']) { + withEnv(['NEXT_BUILD_NUMBER=659']) { // env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'