Fix comportamento reboot

This commit is contained in:
Samuele E. Locatelli
2019-12-04 15:49:59 +01:00
parent b8d5064afb
commit dafe87df10
2 changed files with 8 additions and 5 deletions
+7 -4
View File
@@ -259,11 +259,13 @@ namespace IOB_WIN
foreach (var device in document.Devices)
{
List<MTConnectDevices.DataItem> dataItems = device.GetDataItems();
lgInfo("Inizio STEP 02");
lgInfo($"Inizio STEP 02 per caricare {dataItems.Count} dataItems");
foreach (var dataItem in dataItems)
{
#if false
string sVal = $"STEP 03 | Category: {dataItem.Category} | Type: {dataItem.Type} | Id: {dataItem.Id} | Name: {dataItem.Name}";
lgInfo(sVal);
lgInfo(sVal);
#endif
try
{
currDataItem = formatDataItem(ref dSamplePeriod, ref threshDBand, ref uuid, dataItem);
@@ -297,7 +299,7 @@ namespace IOB_WIN
// invio IN BLOCCO il dataItem serializzati...
if (elencoDataItems.Count > 0)
{
lgInfo("STEP 04 invio dati");
lgInfo($"STEP 04 invio dati di {elencoDataItems.Count} records");
sendDataItemsList(elencoDataItems);
}
hasReadItems = true;
@@ -1072,8 +1074,9 @@ namespace IOB_WIN
if (enableMtcRestart)
{
// controllo se ho ricevuto il current da OLTRE 1 minuto...
if (lastCurrent.AddMinutes(1) < adesso)
if (lastCurrent.AddMinutes(3) < adesso)
{
lastCurrent = adesso;
// stop...
lgInfo("Fermato MTC_ref per mancanza dati current");
MTC_ref.Stop();
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=568']) {
withEnv(['NEXT_BUILD_NUMBER=569']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'