From 27c61890bc71f279c366e5e633df94a753083a17 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 29 Jan 2018 18:57:23 +0100 Subject: [PATCH] tolto anche lettura sysinfo x errore... --- IOB-WIN/App.config | 1 + IOB-WIN/IobGeneric.cs | 41 ++++++++++++++++++++++------------------- Jenkinsfile | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config index ff727028..46450b34 100644 --- a/IOB-WIN/App.config +++ b/IOB-WIN/App.config @@ -11,6 +11,7 @@ + diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 79909379..f46eecbe 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -1432,27 +1432,30 @@ namespace IOB_WIN /// private void processSysInfo() { - Dictionary currSysInfo = new Dictionary(); - if (!DemoIn) + if (utils.CRB("enableSysInfo")) { - currSysInfo = getSysInfo(); - } - else - { - currSysInfo.Add("SYS-DEMO", string.Format("S-{0:HHmm}", DateTime.Now)); - } - // verifico SE sia cambiato il programma... - if (lastSysInfo != currSysInfo["SYSINFO"]) - { - // salvo! - lastSysInfo = currSysInfo["SYSINFO"]; - // per ogni valore del dizionario mostro ed accodo! - string sVal = ""; - foreach (var item in currSysInfo) + Dictionary currSysInfo = new Dictionary(); + if (!DemoIn) { - sVal = string.Format("[SYSINFO]{0}|{1}", item.Key, item.Value); - // chiamo accodamento... - accodaFLog(sVal, qEncodeFLog(item.Key, item.Value)); + currSysInfo = getSysInfo(); + } + else + { + currSysInfo.Add("SYS-DEMO", string.Format("S-{0:HHmm}", DateTime.Now)); + } + // verifico SE sia cambiato il programma... + if (lastSysInfo != currSysInfo["SYSINFO"]) + { + // salvo! + lastSysInfo = currSysInfo["SYSINFO"]; + // per ogni valore del dizionario mostro ed accodo! + string sVal = ""; + foreach (var item in currSysInfo) + { + sVal = string.Format("[SYSINFO]{0}|{1}", item.Key, item.Value); + // chiamo accodamento... + accodaFLog(sVal, qEncodeFLog(item.Key, item.Value)); + } } } } diff --git a/Jenkinsfile b/Jenkinsfile index 09c3ce46..695e12a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=205']) { + withEnv(['NEXT_BUILD_NUMBER=206']) { // env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'