From 19986dc38dc991cae5d178147fa3446b6f43e0d6 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 24 Jul 2024 17:27:25 +0200
Subject: [PATCH] Update x gestione redis non locale, da testare in prod

---
 GWMS.UI/GWMS.UI.csproj                        |  2 +-
 GWMS.UI/Health/Checks.cs                      |  1 -
 GWMS.UI/Startup.cs                            | 22 +++++++++++++++++--
 GWMS.UI/appsettings.Production.json           |  4 ++--
 ...json => appsettings.Production.local.json} |  2 +-
 GWMS.UI/appsettings.json                      |  2 +-
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 9 files changed, 28 insertions(+), 11 deletions(-)
 rename GWMS.UI/{appsettings.Production2.json => appsettings.Production.local.json} (97%)

diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj
index 25e85ef..8f095bb 100644
--- a/GWMS.UI/GWMS.UI.csproj
+++ b/GWMS.UI/GWMS.UI.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>1.0.2407.2415</Version>
+		<Version>1.0.2407.2417</Version>
 		<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
diff --git a/GWMS.UI/Health/Checks.cs b/GWMS.UI/Health/Checks.cs
index deb3845..44d3095 100644
--- a/GWMS.UI/Health/Checks.cs
+++ b/GWMS.UI/Health/Checks.cs
@@ -128,7 +128,6 @@ namespace GWMS.UI.Health
                         description += $" - {pingResult.RoundtripTime}ms";
                         return HealthCheckResult.Healthy(description, healthCheckData);
                     }
-
                     return HealthCheckResult.Unhealthy(description + $" {hostName}", null, healthCheckData);
                 }
             }
diff --git a/GWMS.UI/Startup.cs b/GWMS.UI/Startup.cs
index 1ddd1ab..f3f9798 100644
--- a/GWMS.UI/Startup.cs
+++ b/GWMS.UI/Startup.cs
@@ -17,6 +17,7 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
 using System;
 using System.Globalization;
+using System.Linq;
 
 namespace GWMS.UI
 {
@@ -210,10 +211,27 @@ namespace GWMS.UI
             //    options.ConnectionString = elmaConn;
             //});
 
+            // spacchetto conf redis che è cache prima maniera...
+            var redisConfData = connStringRedis.Split(",");
+            int redisDb = 13;
+            int redisPort = 6379;
+            if(redisConfData.Length > 0)
+            {
+                string recDb = redisConfData.First(x => x.StartsWith("DefaultDatabase"));
+                if (recDb != null)
+                {
+                    int.TryParse(recDb.Replace("DefaultDatabase=", ""), out redisDb);
+                }
+                string recPort = redisConfData.First(x => x.Contains(":"));
+                if (recPort != null)
+                {
+                    int.TryParse(recPort.Replace($"{redisSrvAddr}:", ""), out redisPort);
+                }
+            }
+
             services.AddStackExchangeRedisCache(options =>
             {
-                //options.Configuration = "localhost:6379";
-                options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = 12, EndPoints = { { "localhost", 6379 } } };
+                options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = redisDb, EndPoints = { { redisSrvAddr, redisPort } } };
                 options.InstanceName = "GWMS:";
             });
 
diff --git a/GWMS.UI/appsettings.Production.json b/GWMS.UI/appsettings.Production.json
index c90a895..bf5296a 100644
--- a/GWMS.UI/appsettings.Production.json
+++ b/GWMS.UI/appsettings.Production.json
@@ -7,14 +7,14 @@
     }
   },
   "ConnectionStrings": {
-    "Redis": "localhost:6379",
+    "Redis": "redis01.ovh:6379, DefaultDatabase=13, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, allowAdmin=true",
     "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
     "DefaultConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
     "AdminConnection": "Server=localhost;port=3306;database=GWMS;user=root;pwd=Egalware_24068!;sslmode=None;",
     "GWMS.Data": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
   },
   "DbConfig": {
-    "Server": "localhost",
+    "Server": "mdb.ovh",
     "nKey": "PZZFRR",
     "sKey": "M3T@n0"
   },
diff --git a/GWMS.UI/appsettings.Production2.json b/GWMS.UI/appsettings.Production.local.json
similarity index 97%
rename from GWMS.UI/appsettings.Production2.json
rename to GWMS.UI/appsettings.Production.local.json
index 1233f13..c90a895 100644
--- a/GWMS.UI/appsettings.Production2.json
+++ b/GWMS.UI/appsettings.Production.local.json
@@ -14,7 +14,7 @@
     "GWMS.Data": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
   },
   "DbConfig": {
-    "Server": "mdb.ovh",
+    "Server": "localhost",
     "nKey": "PZZFRR",
     "sKey": "M3T@n0"
   },
diff --git a/GWMS.UI/appsettings.json b/GWMS.UI/appsettings.json
index 8a2f7fe..ba7715a 100644
--- a/GWMS.UI/appsettings.json
+++ b/GWMS.UI/appsettings.json
@@ -8,7 +8,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "Redis": "localhost:6379",
+    "Redis": "localhost:6379, DefaultDatabase=13, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, allowAdmin=true",
     "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
     "DefaultConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
     "AdminConnection": "Server=localhost;port=3306;database=GWMS;user=root;pwd=Egalware_24068!;sslmode=None;",
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 61d59cb..d9467c8 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2407.2415</h4>
+    <h4>Versione: 1.0.2407.2417</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 5679bfa..bbc5ba7 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2407.2415
+1.0.2407.2417
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 0b0ad7a..05a8674 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2407.2415</version>
+  <version>1.0.2407.2417</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>