diff --git a/Jenkinsfile b/Jenkinsfile
index 79a355c..b716ea9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'
diff --git a/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs b/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs
index 1706df5..3f9ccac 100644
--- a/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs
+++ b/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs
@@ -47,6 +47,24 @@ namespace OPC_UA_REDIS
///
private ArrayList mDataItems = new ArrayList();
+ ///
+ /// Verifica dello status del server redis (= SERVIZIO DISPONIBILE)
+ ///
+ public bool redisSrvOk
+ {
+ get
+ {
+ bool answ = false;
+
+ try
+ {
+ answ = redUtil.connRedis.IsConnected;
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
///
/// Classe adapter verso REDIS
diff --git a/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs b/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs
index 175c921..ad5e43f 100644
--- a/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs
+++ b/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs
@@ -88,6 +88,7 @@ namespace SCMA.AdapterCom
switch (numServ)
{
case 1:
+ answ = mAdapter.redisSrvOk;
break;
case 2:
break;
diff --git a/MTC_Adapter/SCMA/AdapterGeneric.cs b/MTC_Adapter/SCMA/AdapterGeneric.cs
index f168614..4457373 100644
--- a/MTC_Adapter/SCMA/AdapterGeneric.cs
+++ b/MTC_Adapter/SCMA/AdapterGeneric.cs
@@ -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)
diff --git a/MTC_Adapter/SCMA/App.config b/MTC_Adapter/SCMA/App.config
index aaf0a77..a646b16 100644
--- a/MTC_Adapter/SCMA/App.config
+++ b/MTC_Adapter/SCMA/App.config
@@ -9,7 +9,7 @@
-
+