Merge branch 'release/AddConfMaxAge'

MON:
- fix: parametro MaxAge usato anche x redis - cambio maxAge a 2000ms
2022-07-15 17:36:41 +02:00 · 2022-07-15 17:36:21 +02:00 · 2022-07-15 17:23:58 +02:00 · 2022-07-15 17:16:43 +02:00 · 2022-07-15 17:15:57 +02:00 · 2022-07-15 17:14:44 +02:00
8 changed files with 20 additions and 7 deletions
@@ -259,7 +259,14 @@ namespace MP.Mon.Components
            {
                double cTimeMin = currTimeMin != null ? (double)currTimeMin : 0;
                tSpan = TimeSpan.FromMinutes(cTimeMin);
-                answ = $"{tSpan:mm}:{tSpan:ss}";
+                if (tSpan.TotalHours < 1)
+                {
+                    answ = $"{tSpan:mm}:{tSpan:ss}";
+                }
+                else
+                {
+                    answ = $"{tSpan.TotalHours:N0}h {tSpan:mm}:{tSpan:ss}";
+                }
            }
            catch
            { }
@@ -117,6 +117,8 @@ namespace MP.Mon.Data

        public async Task<List<MappaStatoExpl>> MseGetAll()
        {
+            int maxAge = 2000;
+            int.TryParse(_configuration.GetValue<string>("ServerConf:maxAge"), out maxAge);
            Stopwatch stopWatch = new Stopwatch();
            stopWatch.Start();
            List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
@@ -131,10 +133,10 @@ namespace MP.Mon.Data
            }
            else
            {
-                result = await Task.FromResult(dbController.MseGetAll());
+                result = await Task.FromResult(dbController.MseGetAll(maxAge));
                // serializzp e salvo...
                rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(redisMseKey, rawData, TimeSpan.FromSeconds(2));
+                await redisDb.StringSetAsync(redisMseKey, rawData, TimeSpan.FromMilliseconds(maxAge));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
                Log.Debug($"Read from DB: {ts.TotalMilliseconds}ms");
@@ -4,7 +4,7 @@
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2207.1309</Version>
+    <Version>6.15.2207.1517</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -7,6 +7,7 @@
 <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="google" content="notranslate">
    <base href="~/" />
    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
    <link rel="stylesheet" href="css/site.css" />
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.15.2207.1309</h4>
+    <h4>Versione: 6.15.2207.1517</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.15.2207.1309
+6.15.2207.1517
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.1309</version>
+  <version>6.15.2207.1517</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
@@ -11,5 +11,8 @@
    "MP.Mon": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
    "MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
    "Redis": "localhost:6379,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
+  },
+  "ServerConf": {
+    "maxAge": "2000"
  }
 }
Author	SHA1	Message	Date
Samuele Locatelli	d5d47076df	Merge branch 'release/AddConfMaxAge'	2022-07-15 17:36:41 +02:00
Samuele Locatelli	612c3c95f7	MON: - fix: parametro MaxAge usato anche x redis - cambio maxAge a 2000ms	2022-07-15 17:36:21 +02:00
Samuele Locatelli	dddac15b52	MON: - update x conf maxAge da appsetting.json	2022-07-15 17:23:58 +02:00
Samuele Locatelli	a315e4f0ef	Merge tag 'FixDisplayMonHours' into develop Update x display ore in MON	2022-07-15 17:16:43 +02:00
Samuele Locatelli	d71e9465e5	Merge branch 'release/FixDisplayMonHours'	2022-07-15 17:15:57 +02:00
Samuele Locatelli	876197b0ac	Update display MON x vedere HH	2022-07-15 17:14:44 +02:00
Samuele Locatelli	cd07a940d0	Merge tag 'UpdateLand4WCS' into develop update x compatibilità con nuovi metodi WebConfigSetter	2022-07-14 17:55:44 +02:00