Prima bozza testing status redis

This commit is contained in:
Samuele E. Locatelli
2018-10-01 18:44:22 +02:00
parent b8e4b67c86
commit b7af9a42a2
5 changed files with 27 additions and 2 deletions
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=324']) {
withEnv(['NEXT_BUILD_NUMBER=325']) {
// 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'
+18
View File
@@ -47,6 +47,24 @@ namespace OPC_UA_REDIS
/// </summary>
private ArrayList mDataItems = new ArrayList();
/// <summary>
/// Verifica dello status del server redis (= SERVIZIO DISPONIBILE)
/// </summary>
public bool redisSrvOk
{
get
{
bool answ = false;
try
{
answ = redUtil.connRedis.IsConnected;
}
catch
{ }
return answ;
}
}
/// <summary>
/// Classe adapter verso REDIS
@@ -88,6 +88,7 @@ namespace SCMA.AdapterCom
switch (numServ)
{
case 1:
answ = mAdapter.redisSrvOk;
break;
case 2:
break;
+6
View File
@@ -2980,6 +2980,12 @@ namespace SCMA
{
if (currGateway.protocollo == gwProtocol.SOURS)
{
bool rOK = false;
// imposto bit controllo servizio REDIS attivo
rOK = currGateway.checkStatus(1);
retACK_DW = utils.setBitOnStFlag(retACK_DW, rOK, 16);
// controllo catena REDIS | OPC-UA | Gateway | Internet
// !!!FARE!!!
// verifico se ci siano messaggi da recapitare (MConnect --> GateWay --> macchina)
+1 -1
View File
@@ -9,7 +9,7 @@
<!--parametri protocollo comunicazione-->
<!--<add key="adpProto" value="MTC" />-->
<!--<add key="adpProto" value="SOURS" />-->
<add key="adpProto" value="MTC" />
<add key="adpProto" value="SOURS" />
<add key="MTC_port" value="7878" />
<add key="SOURS_IP" value="localhost" />
<add key="SOURS_port" value="6379" />