From 3c1fdb92a289dd52cab63de3a6bad6dce9c8cf49 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 24 Apr 2026 09:57:48 +0200 Subject: [PATCH] Ulteriore update x test factory in prod --- MP.Data/DataServiceCollectionExtensions.cs | 2 ++ MP.IOC/Controllers/IOBController.cs | 4 +-- MP.IOC/Data/MpDataService.cs | 34 +++++++++++++--------- MP.IOC/MP.IOC.csproj | 2 +- MP.IOC/Program.cs | 6 ++-- MP.IOC/Resources/ChangeLog.html | 2 +- MP.IOC/Resources/VersNum.txt | 2 +- MP.IOC/Resources/manifest.xml | 2 +- MP.IOC/appsettings.Production.json | 3 ++ 9 files changed, 34 insertions(+), 23 deletions(-) diff --git a/MP.Data/DataServiceCollectionExtensions.cs b/MP.Data/DataServiceCollectionExtensions.cs index 4fa52ee2..40e538a9 100644 --- a/MP.Data/DataServiceCollectionExtensions.cs +++ b/MP.Data/DataServiceCollectionExtensions.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using MP.Data.Controllers; using MP.Data.Repository.Mtc; using MP.Data.Repository.Utils; using MP.Data.Services.Mtc; @@ -29,6 +30,7 @@ namespace MP.Data // Servizi Singleton services.TryAddSingleton(); + services.TryAddSingleton(); // Servizi Scoped services.TryAddScoped(); diff --git a/MP.IOC/Controllers/IOBController.cs b/MP.IOC/Controllers/IOBController.cs index bf34f9b0..841f3958 100644 --- a/MP.IOC/Controllers/IOBController.cs +++ b/MP.IOC/Controllers/IOBController.cs @@ -1212,7 +1212,7 @@ namespace MP.IOC.Controllers string answ = "-1"; DateTime dataOraEvento = DateTime.Now; - Log.Info($"Salvataggio counter | id: {id} | pzCount: {counter}"); + Log.Debug($"Salvataggio counter | id: {id} | pzCount: {counter}"); try { answ = await DService.saveCounterAsync(id, counter); @@ -1595,7 +1595,7 @@ namespace MP.IOC.Controllers innovazioni.Add(trovato); } // faccio upsert innovations! - DService.UpsertCurrObjItemsAsync(idxMacc, innovazioni); + await DService.UpsertCurrObjItemsAsync(idxMacc, innovazioni); Log.Info($"processFLogJsonAsync | {idxMacc} | Updated {innovazioni.Count} par"); } catch (Exception exc) diff --git a/MP.IOC/Data/MpDataService.cs b/MP.IOC/Data/MpDataService.cs index 9e0b53b7..01da2c4e 100644 --- a/MP.IOC/Data/MpDataService.cs +++ b/MP.IOC/Data/MpDataService.cs @@ -7,7 +7,6 @@ using MP.Data.Controllers; using MP.Data.DbModels; using MP.Data.DbModels.Anag; using MP.Data.MgModels; -using MP.Data.Repository.Mtc; using MP.Data.Services.Mtc; using Newtonsoft.Json; using NLog; @@ -27,7 +26,6 @@ namespace MP.IOC.Data IConfiguration configuration, ILogger logger, IServiceScopeFactory scopeFactory, - IMtcSetupRepository mtcRepo, IMtcSetupService mtcServ) { _logger = logger; @@ -59,12 +57,11 @@ namespace MP.IOC.Data } else { - SpecDbController = new MP.Data.Controllers.MpSpecController(configuration); - IocDbController = new MP.Data.Controllers.MpIocController(configuration); + SpecDbController = new MpSpecController(configuration); + IocDbController = new MpIocController(configuration); _logger.LogInformation("DbControllers INIT OK"); } - MtcRepo = mtcRepo; MtcService = mtcServ; // conf mongo... @@ -75,7 +72,7 @@ namespace MP.IOC.Data } else { - mongoController = new MP.Data.Controllers.MpMongoController(configuration); + mongoController = new MpMongoController(configuration); _logger.LogInformation("MongoController INIT OK"); } } @@ -84,11 +81,10 @@ namespace MP.IOC.Data #region Public Properties - public static MP.Data.Controllers.MpIocController IocDbController { get; set; } = null!; - public static MP.Data.Controllers.MpMongoController mongoController { get; set; } = null!; - public static MP.Data.Controllers.MpSpecController SpecDbController { get; set; } = null!; - private static MP.Data.Services.Mtc.IMtcSetupService MtcService = null!; - private static MP.Data.Repository.Mtc.IMtcSetupRepository MtcRepo; + public static MpIocController IocDbController { get; set; } = null!; + public static MpMongoController mongoController { get; set; } = null!; + public static MpSpecController SpecDbController { get; set; } = null!; + private static IMtcSetupService MtcService = null!; public MessagePipe BroadastMsgPipe { get; set; } = null!; /// @@ -1918,7 +1914,17 @@ namespace MP.IOC.Data } else { - result = await IocDbController.Macchine2SlaveAsync(); + if (useFactory) + { + await using var scope = _scopeFactory.CreateAsyncScope(); + var mtcService = scope.ServiceProvider.GetRequiredService(); + result = await mtcService.Macchine2SlaveAsync(); + } + else + { + result = await IocDbController.Macchine2SlaveAsync(); + } + // serializzo e salvo... rawData = JsonConvert.SerializeObject(result); await redisDb.StringSetAsync(currKey, rawData, getRandTOut(redisLongTimeCache * 10)); @@ -2197,13 +2203,13 @@ namespace MP.IOC.Data { // lo ri-aggiungo x non perderlo innovations.Add(item); - Log.Trace($"innovations | add | item.uid: {item.uid} | item.value: {item.value}"); + Log.Info($"innovations | add | item.uid: {item.uid} | item.value: {item.value}"); } // altrimenti aggiorno campo (non trasmesso) name e tengo il resto... else { trovato.name = item.name; - Log.Info($"innovations | update | item.uid: {item.uid} | item.value: {item.value} --> {trovato.value} "); + Log.Debug($"innovations | update | item.uid: {item.uid} | item.value: {item.value} --> {trovato.value} "); } } // serializzo e salvo diff --git a/MP.IOC/MP.IOC.csproj b/MP.IOC/MP.IOC.csproj index 75c40bf1..325914bc 100644 --- a/MP.IOC/MP.IOC.csproj +++ b/MP.IOC/MP.IOC.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 6.16.2604.2407 + 6.16.2604.2409 diff --git a/MP.IOC/Program.cs b/MP.IOC/Program.cs index 226dd3a4..e665ee1f 100644 --- a/MP.IOC/Program.cs +++ b/MP.IOC/Program.cs @@ -28,8 +28,8 @@ logger.Info($"Current ASPNETCORE_ENVIRONMENT: {env.EnvironmentName}"); ConfigurationManager configuration = builder.Configuration; // REDIS setup logger.Info("Config OK"); -string connStringRedis = configuration.GetConnectionString("Redis"); -string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":")); +string confRedis = configuration.GetConnectionString("Redis"); +string redisSrvAddr = confRedis.Substring(0, confRedis.IndexOf(":")); logger.Info("Setup REDIS OK"); @@ -100,7 +100,7 @@ builder.Services.AddSwaggerGen(c => }); // avvio oggetto shared x redis... -var redisMux = ConnectionMultiplexer.Connect(connStringRedis); +var redisMux = ConnectionMultiplexer.Connect(confRedis); builder.Services.AddSingleton(redisMux); // oggetto principale accesso dati diff --git a/MP.IOC/Resources/ChangeLog.html b/MP.IOC/Resources/ChangeLog.html index c380f0ad..4eca0ee3 100644 --- a/MP.IOC/Resources/ChangeLog.html +++ b/MP.IOC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MP-IOC -

Versione: 6.16.2604.2407

+

Versione: 6.16.2604.2409


Note di rilascio:
  • diff --git a/MP.IOC/Resources/VersNum.txt b/MP.IOC/Resources/VersNum.txt index ad965d8d..219b11f3 100644 --- a/MP.IOC/Resources/VersNum.txt +++ b/MP.IOC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2604.2407 +6.16.2604.2409 diff --git a/MP.IOC/Resources/manifest.xml b/MP.IOC/Resources/manifest.xml index 9113ad2f..b6807d56 100644 --- a/MP.IOC/Resources/manifest.xml +++ b/MP.IOC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2604.2407 + 6.16.2604.2409 https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html false diff --git a/MP.IOC/appsettings.Production.json b/MP.IOC/appsettings.Production.json index 82f4a9bb..5b315b32 100644 --- a/MP.IOC/appsettings.Production.json +++ b/MP.IOC/appsettings.Production.json @@ -32,6 +32,9 @@ "RedisAdmin": "localhost:6379,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true", "mdbConnString": "mongodb://localhost:27017" }, + "ServerConf": { + "useFactory": false + }, "RedisScripts": { "Scripts": { "Update": "RedisScript/RedisUpdateScript_v5.lua"