From 68936953dd874c18b3cb3609c6339fcdc4bebec9 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 19 Jul 2025 16:33:56 +0200
Subject: [PATCH] =?UTF-8?q?MAN:=20-=20cambio=20comportamento=20in=20caso?=
 =?UTF-8?q?=20Adapter=20NON=20running=20(NON=20continua=20a=20chiamare=20R?=
 =?UTF-8?q?EDIS=20ma=20usa=20obj=20in=20memoria)=20-=20ulteriore=20fix=20i?=
 =?UTF-8?q?n=20modalit=C3=A0=20gestione=20dati=20REDIS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IOB-MAN.Core/Data/RedisIobCache.cs |  6 ++++--
 IOB-MAN.Core/IobAdapt.cs           | 10 ++++++----
 IOB-MAN/CONF/IOB-MAN-CONFIG.json   |  6 +++---
 IOB-MAN/IOB-MAN.csproj             |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/IOB-MAN.Core/Data/RedisIobCache.cs b/IOB-MAN.Core/Data/RedisIobCache.cs
index e5a0cb2..62f54af 100644
--- a/IOB-MAN.Core/Data/RedisIobCache.cs
+++ b/IOB-MAN.Core/Data/RedisIobCache.cs
@@ -156,6 +156,8 @@ namespace IOB_MAN.Core.Data
                     {
                         // deserializzo
                         answ = JsonConvert.DeserializeObject<IobWinStatusDTO>(rawData) ?? new IobWinStatusDTO();
+                        // imposto cache validità x dati letti...
+                        ChanDataValidUntil = DateTime.Now.AddSeconds(randTTL);
 #if DEBUG
                         NumReadCache++;
 #endif
@@ -1194,9 +1196,9 @@ namespace IOB_MAN.Core.Data
         private string AppName = "IOB";
 
         /// <summary>
-        /// Validità (in sec) delle info ricevute da PubSub Channel, altrimenti rilegge da cache
+        /// Validità (in sec) delle info ricevute da PubSub Channel, altrimenti rilegge da cache (e poi rimane valido x questo TTL sec)
         /// </summary>
-        private int ChanDataValidSec = 60;
+        private int ChanDataValidSec = 30;
 
         /// <summary>
         /// DataOra scadenza validità update ricevuto da PubSub Channel
diff --git a/IOB-MAN.Core/IobAdapt.cs b/IOB-MAN.Core/IobAdapt.cs
index 920596b..e0b132a 100644
--- a/IOB-MAN.Core/IobAdapt.cs
+++ b/IOB-MAN.Core/IobAdapt.cs
@@ -252,16 +252,18 @@ namespace IOB_MAN.Core
         {
             get
             {
-                return redisMan.CurrIobStatus;
+                if (isRunning && redisMan != null)
+                {
+                    lastIobStatus = redisMan.CurrIobStatus;
+                }
+                return lastIobStatus;
             }
         }
 
-#if false
         /// <summary>
         /// Ultimo status IOB letto
         /// </summary>
-        protected IobWinStatusDTO lastIobStatus { get; set; } = new IobWinStatusDTO(); 
-#endif
+        protected IobWinStatusDTO lastIobStatus { get; set; } = new IobWinStatusDTO();
 
         protected DateTime lastSeen { get; set; } = DateTime.Now;
 
diff --git a/IOB-MAN/CONF/IOB-MAN-CONFIG.json b/IOB-MAN/CONF/IOB-MAN-CONFIG.json
index 8bde06b..6ae2854 100644
--- a/IOB-MAN/CONF/IOB-MAN-CONFIG.json
+++ b/IOB-MAN/CONF/IOB-MAN-CONFIG.json
@@ -2,10 +2,10 @@
   "ListIOB": {
     //"SIMUL_01": "IOB-WIN-MTC",
     //"SIMUL_02": "IOB-WIN-MTC",
-    //"SIMUL_03": "IOB-WIN-MTC",
+    "SIMUL_03": "IOB-WIN-MBUS",
     "SIMUL_03_SHELLY": "IOB-WIN-SHELLY",
-    //"SIMUL_04": "IOB-WIN-OPC-UA",
-    "SIMUL_04_SHELLY": "IOB-WIN-SHELLY",
+    "SIMUL_04": "IOB-WIN-MBUS",
+    "SIMUL_04_SHELLY": "IOB-WIN-SHELLY"
     //"SIMUL_05": "IOB-WIN-WPS",
     //"SIMUL_06": "IOB-WIN-WPS",
     //"SIMUL_07": "IOB-WIN-PING",
diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj
index 7fd8b0d..cf84e3d 100644
--- a/IOB-MAN/IOB-MAN.csproj
+++ b/IOB-MAN/IOB-MAN.csproj
@@ -8,7 +8,7 @@
         <Nullable>enable</Nullable>
         <UseWindowsForms>true</UseWindowsForms>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>4.0.2507.1413</Version>
+        <Version>4.0.2507.1916</Version>
         <Configurations>Debug;Release;Remote_DEBUG</Configurations>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     </PropertyGroup>