From b8307b31bccf0d6d869df263957cfe4ff1d7006d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 30 Nov 2020 19:42:43 +0100 Subject: [PATCH 1/2] update periodo force check (5-->60 sec) --- IOB-MAN/IOBManPanel.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index 1f6bca83..ca66b46d 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -60,9 +60,9 @@ namespace IOB_MAN protected bool checkRunning = false; /// - /// Counter del timer di forceCheck + /// Counter del timer di forceCheck (60 sec, era 5 sec) /// - protected int forceCheckPeriod = 5000; + protected int forceCheckPeriod = 60000; /// /// Totale processi avviati @@ -514,12 +514,14 @@ namespace IOB_MAN } } } - // attendo 2*waitForExitMsec che i processi possano chiudersi gracefully... - Thread.Sleep(waitForExitMsec * 2); - forceKillByName(TargetName); - // ripeto seconda volta x sicurezza - Thread.Sleep(waitForExitMsec * 4); - forceKillByName(TargetName); + if (item2rem.Count > 0) + { // attendo 2*waitForExitMsec che i processi possano chiudersi gracefully... + Thread.Sleep(waitForExitMsec * 2); + forceKillByName(TargetName); + // ripeto seconda volta x sicurezza + Thread.Sleep(waitForExitMsec * 4); + forceKillByName(TargetName); + } // verifico se resettare if (doReset) { From 3146b4458f5005f77378b7d4180062d209f8fdc2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 30 Nov 2020 19:42:52 +0100 Subject: [PATCH 2/2] new rel 753 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 75c18ade..1e076f0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=752']) { + withEnv(['NEXT_BUILD_NUMBER=753']) { // 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'