Egalware/magman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/FixWarningMysql_03'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-09-23 10:34:10 +02:00
parent 21bbcccf76 6aed95aa68
commit 71ab37f101
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MagMan.UI/MagMan.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>1.0.2509.2309</Version> <Version>1.0.2509.2310</Version>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<EnableNETAnalyzers>true</EnableNETAnalyzers> <EnableNETAnalyzers>true</EnableNETAnalyzers>
MagMan.UI/Program.cs
+2 -6
View File
@@ -43,11 +43,9 @@ string admConnStr = MagMan.Data.Admin.DbConfig.CONNECTION_STRING;
// inizializzo il DB e creo (se necessario) l'utente // inizializzo il DB e creo (se necessario) l'utente
MagMan.Data.Admin.DbConfig.CheckUser(nKey, sKey); MagMan.Data.Admin.DbConfig.CheckUser(nKey, sKey);
MagMan.Data.Admin.DbConfig.ExecMigrationIdentity();
// migrazione Db x gestione multitenant // migrazione Db x gestione multitenant
MagMan.Data.Admin.DbConfig.ExecMigrationMultiTenant(); MagMan.Data.Admin.DbConfig.ExecMigrationMultiTenant();
string connStringDB = MagMan.Data.Admin.DbConfig.CONNECTION_STRING; string connStringDB = MagMan.Data.Admin.DbConfig.CONNECTION_STRING;
/* /*
@@ -60,19 +58,17 @@ string connStringDB = MagMan.Data.Admin.DbConfig.CONNECTION_STRING;
* *
* */ * */
// abilitazione blobale healthCheck... // abilitazione blobale healthCheck...
bool enabHealth = builder.Configuration.GetValue<bool>("OptConf:EnableHealth2"); bool enabHealth = builder.Configuration.GetValue<bool>("OptConf:EnableHealth");
if (enabHealth) if (enabHealth)
{ {
//string redisConnCheck = "redis.ufficio:26379, serviceName=devel, DefaultDatabase=14, connectTimeout=2000, syncTimeout=2000, asyncTimeout=2000, abortConnect=false, ssl=false, allowAdmin=true";
string redisConnCheck = "redis.ufficio:6378, DefaultDatabase=14, connectTimeout=2000, syncTimeout=2000, asyncTimeout=2000, abortConnect=false, ssl=false, allowAdmin=true";
builder.Services.AddHealthChecks() builder.Services.AddHealthChecks()
.AddMySql(connStringDB, "MySql instance") .AddMySql(connStringDB, "MySql instance")
.AddAsyncCheck($"DB PING ({dbServerAddr})", () => MagMan.UI.Health.Checks.PingCheck(dbServerAddr)) .AddAsyncCheck($"DB PING ({dbServerAddr})", () => MagMan.UI.Health.Checks.PingCheck(dbServerAddr))
.AddAsyncCheck($"Redis PING ({redisSrvAddr})", () => MagMan.UI.Health.Checks.PingCheck(redisSrvAddr)) .AddAsyncCheck($"Redis PING ({redisSrvAddr})", () => MagMan.UI.Health.Checks.PingCheck(redisSrvAddr))
// 512 MB max allocated memory // 512 MB max allocated memory
.AddProcessAllocatedMemoryHealthCheck(512, "Max Process memory (<512MB)", failureStatus: HealthStatus.Degraded) .AddProcessAllocatedMemoryHealthCheck(512, "Max Process memory (<512MB)", failureStatus: HealthStatus.Degraded)
// 2025.09.23 problemi con sentinel... commentato!
//.AddRedis(connStringRedis, "Redis", failureStatus: HealthStatus.Degraded) //.AddRedis(connStringRedis, "Redis", failureStatus: HealthStatus.Degraded)
.AddRedis(redisConnCheck, "Redis", failureStatus: HealthStatus.Degraded)
//.AddRedis(builder.Configuration.GetConnectionString("Redis"), "Redis", failureStatus: HealthStatus.Degraded) //.AddRedis(builder.Configuration.GetConnectionString("Redis"), "Redis", failureStatus: HealthStatus.Degraded)
.AddAsyncCheck($"MySql Identity", () => MagMan.UI.Health.Checks.DbIdentity(MagMan.Data.Admin.DbConfig.DATABASE_NAME)) .AddAsyncCheck($"MySql Identity", () => MagMan.UI.Health.Checks.DbIdentity(MagMan.Data.Admin.DbConfig.DATABASE_NAME))
.AddAsyncCheck($"MySql Customers", () => MagMan.UI.Health.Checks.CustomersCount()) .AddAsyncCheck($"MySql Customers", () => MagMan.UI.Health.Checks.CustomersCount())
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body> <body>
<i>MagMan - Wood Warehouse Management System</i> <i>MagMan - Wood Warehouse Management System</i>
<h4>Versione: 1.0.2509.2309</h4> <h4>Versione: 1.0.2509.2310</h4>
<br /> Note di rilascio: <br /> Note di rilascio:
<ul> <ul>
<li> <li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2509.2309 1.0.2509.2310
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<item> <item>
<version>1.0.2509.2309</version> <version>1.0.2509.2310</version>
<url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url> <url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog> <changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory> <mandatory>false</mandatory>