diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index b9f90a89..262062a1 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace MP.Stats.Data { - public class MpStatsService : BaseServ, IDisposable + public class MpStatsService : BaseServ { #region Public Fields @@ -23,17 +23,10 @@ namespace MP.Stats.Data #region Public Constructors - public MpStatsService(IConfiguration configuration) : base(configuration) + public MpStatsService(IConfiguration configuration, IConnectionMultiplexer redConn) : base(configuration, redConn) { Stopwatch sw = Stopwatch.StartNew(); sw.Start(); -#if false - _configuration = configuration; - - // setup compoenti REDIS - redisConn = ConnectionMultiplexer.Connect(_configuration.GetConnectionString("Redis")); - redisDb = redisConn.GetDatabase(); -#endif // conf DB string connStr = _configuration.GetConnectionString("MP.Stats"); @@ -201,15 +194,6 @@ namespace MP.Stats.Data return result; } - public void Dispose() - { - // Clear database controller - dbController.Dispose(); - // redis dispose - redisConn = null; - redisDb = null; - } - /// /// Pulizia cache Redis (tutta) /// @@ -777,7 +761,6 @@ namespace MP.Stats.Data #region Protected Fields protected static string connStringBBM = ""; - protected static string connStringFatt = ""; /// @@ -787,20 +770,26 @@ namespace MP.Stats.Data #endregion Protected Fields -#if false - /// - /// Oggetto per connessione a REDIS - /// - protected ConnectionMultiplexer redisConn = null!; - - /// - /// Oggetto DB redis da impiegare x chiamate R/W - /// - protected IDatabase redisDb = null!; -#endif - #region Protected Methods + protected override void Dispose(bool disposing) + { + if (!_disposed) + { + if (disposing) + { + // Free managed resources here + dbController.Dispose(); + } + + // Free unmanaged resources here + _disposed = true; + } + + // Call base class implementation. + base.Dispose(disposing); + } + protected string getCacheKey(string TableName, SelectData CurrFilter) { string answ = $"{TableName}:M_{CurrFilter.IdxMacchina}:AZ_{CurrFilter.Azione}:ART_{CurrFilter.CodArticolo}:KR_{CurrFilter.KeyRichiesta}:O_{CurrFilter.IdxOdl}:D_{CurrFilter.DateStart:yyyyMMddHHmm}_{CurrFilter.DateEnd:yyyyMMddHHmm}"; @@ -818,6 +807,7 @@ namespace MP.Stats.Data #region Private Fields private static Logger Log = LogManager.GetCurrentClassLogger(); + private bool _disposed = false; private string redisBaseKey = "MP:STATS"; #endregion Private Fields diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index d8691f50..3411c932 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2507.1613 - 6.16.2507.1613 + 6.16.2507.2411 + 6.16.2507.2411 true $(NoWarn);1591 en diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index f2b1af10..c3141ffc 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 6.16.2507.1613

+

Versione: 6.16.2507.2411


Note di rilascio: