Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into IOB-NET

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-30 19:42:57 +01:00
parent 0154019838 3146b4458f
commit 1a2ee7eece
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/IOBManPanel.cs
+10 -8
View File
@@ -60,9 +60,9 @@ namespace IOB_MAN
protected bool checkRunning = false;
/// <summary>
/// Counter del timer di forceCheck
/// Counter del timer di forceCheck (60 sec, era 5 sec)
/// </summary>
protected int forceCheckPeriod = 5000;
protected int forceCheckPeriod = 60000;
/// <summary>
/// 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)
{
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'