From b7af9a42a236af3beb2ce92bffb202f91cff78cb Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 1 Oct 2018 18:44:22 +0200
Subject: [PATCH] Prima bozza testing status redis

---
 Jenkinsfile                                 |  2 +-
 MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs      | 18 ++++++++++++++++++
 MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs |  1 +
 MTC_Adapter/SCMA/AdapterGeneric.cs          |  6 ++++++
 MTC_Adapter/SCMA/App.config                 |  2 +-
 5 files changed, 27 insertions(+), 2 deletions(-)

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
     /// </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
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 @@
     <!--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" />