Update gestione FORCE SENZA su invio periodico in caso di forzatura

This commit is contained in:
Samuele E. Locatelli
2018-10-02 10:03:55 +02:00
parent 7fd54f3ad1
commit da0c51d59a
2 changed files with 6 additions and 7 deletions
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=330']) {
withEnv(['NEXT_BUILD_NUMBER=331']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SCMA'
+5 -6
View File
@@ -105,7 +105,6 @@ namespace OPC_UA_REDIS
redServAlive = newStatus;
if (newStatus) checkRedisStatusAndSend();
}
//redServAlive = newStatus;
}
#if false
@@ -199,7 +198,7 @@ namespace OPC_UA_REDIS
refreshData2Send = true;
if (redServAlive)
{
sendChangedData();
sendChangedData(false);
}
else
{
@@ -216,9 +215,9 @@ namespace OPC_UA_REDIS
/// <summary>
/// Invio dati modificati
/// </summary>
/// <param name="timestamp"></param>
/// <param name="forceSend">forza invio di TUTTO comunque...</param>
/// <returns></returns>
private string sendChangedData()
private string sendChangedData(bool forceSend=false)
{
string timestamp = null;
// var accessorie
@@ -238,7 +237,7 @@ namespace OPC_UA_REDIS
List<DataItemRed> together = new List<DataItemRed>();
foreach (DataItemRed di in mDataItems)
{
List<DataItemRed> list = di.ItemList();
List<DataItemRed> list = di.ItemList(forceSend);
together.AddRange(list);
}
@@ -354,7 +353,7 @@ namespace OPC_UA_REDIS
}
if (refreshData2Send)
{
sendChangedData();
sendChangedData(true);
lg.Info("Reinviati dati sendChangedData");
}
if (stopData2Send)