diff --git a/GWMS.UI/Components/MigrationManager.razor b/GWMS.UI/Components/MigrationManager.razor index b094a56..4f9b584 100644 --- a/GWMS.UI/Components/MigrationManager.razor +++ b/GWMS.UI/Components/MigrationManager.razor @@ -71,11 +71,9 @@ protected async Task ReloadData() { - var resultUser = await Health.Checks.DbUserApp(DbConfig.DATABASE_NAME); var resultIden = await Health.Checks.DbIdentity(DbConfig.DATABASE_NAME); - DbUserOk = (resultUser.Status == HealthStatus.Healthy); DbIdentity = (resultIden.Status == HealthStatus.Healthy); - DbAllOk = (DbUserOk && DbIdentity); + DbAllOk = (DbIdentity); } private void reportChange() diff --git a/GWMS.UI/Components/SetupDiagnostics.razor b/GWMS.UI/Components/SetupDiagnostics.razor index a4eaa5e..838ae54 100644 --- a/GWMS.UI/Components/SetupDiagnostics.razor +++ b/GWMS.UI/Components/SetupDiagnostics.razor @@ -23,7 +23,7 @@ } - else if (!(DbUserTableOk && DbIdentity)) + else if (!(DbIdentity)) {
@@ -56,7 +56,6 @@ return model.Password == "f@mmiEntrare!"; } } - protected bool DbUserTableOk { get; set; } = false; protected bool DbLogOk { get; set; } = false; protected bool DbAllOk { get; set; } = false; protected bool DbIdentity { get; set; } = false; @@ -89,13 +88,11 @@ } protected async Task ReloadData() { - var resultUser = await Health.Checks.DbUserApp(DbConfig.DATABASE_NAME); var resultLog = await Health.Checks.DbPlantTable(DbConfig.DATABASE_NAME); var resultIden = await Health.Checks.DbIdentity(DbConfig.DATABASE_NAME); - DbUserTableOk = (resultUser.Status == HealthStatus.Healthy); DbLogOk = (resultLog.Status == HealthStatus.Healthy); DbIdentity = (resultIden.Status == HealthStatus.Healthy); - DbAllOk = (DbUserTableOk && DbLogOk && DbIdentity); + DbAllOk = (DbLogOk && DbIdentity); } } \ No newline at end of file diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index 2d881d0..5183a99 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net5.0 - 1.0.2110.2119 + 1.0.2110.2208 95c9f021-52d1-4390-a670-5810b7b777b0 true true diff --git a/GWMS.UI/Health/Checks.cs b/GWMS.UI/Health/Checks.cs index 029d3c5..610eab8 100644 --- a/GWMS.UI/Health/Checks.cs +++ b/GWMS.UI/Health/Checks.cs @@ -82,33 +82,6 @@ namespace GWMS.UI.Health } } - public static async Task DbUserApp(string dbName) - { - using (var appDb = new GWMSContext()) - { - string description = "Try check Table AppUser"; - List userList = new List(); - var healthCheckData = new Dictionary(); - try - { - // provo a controllare se ho tab utenti - userList = await Task.FromResult(appDb.DbSetUser.ToList()); - //userList = await Task.FromResult(appDb.DbSetUser.ToList()).ConfigureAwait(false); - if (userList.Count > 0) - { - description = $"Check AppUser table, found {userList.Count} records"; - return HealthCheckResult.Healthy(description, healthCheckData); - } - } - catch (Exception exc) - { - Log.Error(exc, "Errore in esecuzione DbUserApp"); - } - - return HealthCheckResult.Degraded(description + $" {dbName}", null, healthCheckData); - } - } - public static async Task DbUserRoot(string dbName) { using (var adminDb = new AdminContext()) diff --git a/GWMS.UI/Startup.cs b/GWMS.UI/Startup.cs index b283c25..30ce83e 100644 --- a/GWMS.UI/Startup.cs +++ b/GWMS.UI/Startup.cs @@ -138,7 +138,6 @@ namespace GWMS.UI .AddProcessAllocatedMemoryHealthCheck(512, "Max Process memory (<512MB)", failureStatus: HealthStatus.Degraded) // 512 MB max allocated memory .AddRedis(Configuration.GetConnectionString("Redis"), "Redis", failureStatus: HealthStatus.Degraded) .AddAsyncCheck($"MySql Root User", () => Health.Checks.DbUserRoot("MySql")) - .AddAsyncCheck($"MySql App Users", () => Health.Checks.DbUserApp(DbConfig.DATABASE_NAME)) .AddAsyncCheck($"MySql Identity", () => Health.Checks.DbIdentity(DbConfig.DATABASE_NAME)) .AddAsyncCheck($"MySql PlantLog", () => Health.Checks.DbPlantTable(DbConfig.DATABASE_NAME)) ; diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 099fb5e..360fc36 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

Versione: 1.0.2110.2119

+

Versione: 1.0.2110.2208


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 2d386eb..bbe21cc 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2110.2119 +1.0.2110.2208 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index bcf82ec..b9dd38c 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2110.2119 + 1.0.2110.2208 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false