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(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"; /// - /// 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) /// - private int ChanDataValidSec = 60; + private int ChanDataValidSec = 30; /// /// 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 /// /// Ultimo status IOB letto /// - 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 @@ enable true enable - 4.0.2507.1413 + 4.0.2507.1916 Debug;Release;Remote_DEBUG false