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

tolto anche lettura sysinfo x errore...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-01-29 18:57:23 +01:00
parent 52759e149d
commit 27c61890bc
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/App.config
+1
View File
@@ -11,6 +11,7 @@
<add key="enableMode" value="true" />
<add key="enableOverrides" value="true" />
<add key="enableDynData" value="false" />
<add key="enableSysInfo" value="false" />
<add key="doMemDump" value="false" />
<add key="doSampleMemory" value="false" />
<add key="basePrgMemPath" value="CNCMEMUSER" />
IOB-WIN/IobGeneric.cs
+22 -19
View File
@@ -1432,27 +1432,30 @@ namespace IOB_WIN
/// </summary>
private void processSysInfo()
{
Dictionary<string, string> currSysInfo = new Dictionary<string, string>();
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<string, string> currSysInfo = new Dictionary<string, string>();
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));
}
}
}
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'