Merge branch 'release/UpdatePack'

Aggiornamento slow time elapse (+/- 10%)

.gitlab-ci.yml

@@ -121,19 +121,19 @@ MON:build:
   script:
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
 
-WAMON:build:
+# WAMON:build:
-  stage: build
+#   stage: build
-  tags:
+#   tags:
-    - win
+#     - win
-  variables:
+#   variables:
-    PROJ_PATH: MP.WASM.Mon\Server
+#     PROJ_PATH: MP.WASM.Mon\Server
-    APP_NAME: MP.WASM.Mon.Server
+#     APP_NAME: MP.WASM.Mon.Server
-    SOL_NAME: MP-WAMON
+#     SOL_NAME: MP-WAMON
-  before_script:
+#   before_script:
-    - *nuget-fix
+#     - *nuget-fix
-    - dotnet restore "$env:SOL_NAME.sln"
+#     - dotnet restore "$env:SOL_NAME.sln"
-  script:
+#   script:
-    - dotnet build $env:PROJ_PATH/$env:APP_NAME.csproj
+#     - dotnet build $env:PROJ_PATH/$env:APP_NAME.csproj
 
 LAND:test:
   stage: test
@@ -199,22 +199,22 @@ MON:test:
   script:
     - dotnet test $env:APP_NAME/$env:APP_NAME.csproj
 
-WAMON:test:
+# WAMON:test:
-  stage: test
+#   stage: test
-  tags:
+#   tags:
-    - win
+#     - win
-  variables:
+#   variables:
-    PROJ_PATH: MP.WASM.Mon\Server
+#     PROJ_PATH: MP.WASM.Mon\Server
-    APP_NAME: MP.WASM.Mon.Server
+#     APP_NAME: MP.WASM.Mon.Server
-    SOL_NAME: MP-WAMON
+#     SOL_NAME: MP-WAMON
-  before_script:
+#   before_script:
-    - *nuget-fix
+#     - *nuget-fix
-    - dotnet restore "$env:SOL_NAME.sln"
+#     - dotnet restore "$env:SOL_NAME.sln"
-  only:
+#   only:
-    - develop
+#     - develop
-  needs: ["WAMON:build"]
+#   needs: ["WAMON:build"]
-  script:
+#   script:
-    - dotnet test $env:PROJ_PATH/$env:APP_NAME.csproj
+#     - dotnet test $env:PROJ_PATH/$env:APP_NAME.csproj
 
 LAND:IIS01:deploy:
   stage: deploy
@@ -280,22 +280,22 @@ MON:IIS01:deploy:
   script: 
     - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
 
-WAMON:IIS01:deploy:
+# WAMON:IIS01:deploy:
-  stage: deploy
+#   stage: deploy
-  tags:
+#   tags:
-    - win
+#     - win
-  variables:
+#   variables:
-    PROJ_PATH: MP.WASM.Mon\Server
+#     PROJ_PATH: MP.WASM.Mon\Server
-    APP_NAME: MP.WASM.Mon.Server
+#     APP_NAME: MP.WASM.Mon.Server
-    SOL_NAME: MP-WAMON
+#     SOL_NAME: MP-WAMON
-  before_script:
+#   before_script:
-    - *nuget-fix
+#     - *nuget-fix
-    - dotnet restore "$env:SOL_NAME.sln"
+#     - dotnet restore "$env:SOL_NAME.sln"
-  only:
+#   only:
-    - develop
+#     - develop
-  needs: ["WAMON:test"]
+#   needs: ["WAMON:test"]
-  script: 
+#   script: 
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
+#     - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
 
 LAND:IIS02:deploy:
   stage: deploy
@@ -365,23 +365,23 @@ MON:IIS02:deploy:
     - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
     - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
 
-WAMON:IIS02:deploy:
+# WAMON:IIS02:deploy:
-  stage: deploy
+#   stage: deploy
-  tags:
+#   tags:
-    - win
+#     - win
-  variables:
+#   variables:
-    PROJ_PATH: MP.WASM.Mon\Server
+#     PROJ_PATH: MP.WASM.Mon\Server
-    APP_NAME: MP.WASM.Mon.Server
+#     APP_NAME: MP.WASM.Mon.Server
-    SOL_NAME: MP-WAMON
+#     SOL_NAME: MP-WAMON
-  before_script:
+#   before_script:
-    - *nuget-fix
+#     - *nuget-fix
-    - dotnet restore "$env:SOL_NAME.sln"
+#     - dotnet restore "$env:SOL_NAME.sln"
-  only:
+#   only:
-    - master
+#     - master
-  needs: ["WAMON:build"]
+#   needs: ["WAMON:build"]
-  script: 
+#   script: 
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
+#     - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
+#     - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
 
 LAND:installer:
   stage: installer
@@ -467,27 +467,27 @@ MON:installer:
     - *hashBuild
     - *nexusUpload
 
-WAMON:installer:
+# WAMON:installer:
-  stage: installer
+#   stage: installer
-  tags:
+#   tags:
-    - win
+#     - win
-  variables:
+#   variables:
-    PROJ_PATH: MP.WASM.Mon\Server
+#     PROJ_PATH: MP.WASM.Mon\Server
-    APP_NAME: MP.WASM.Mon.Server
+#     APP_NAME: MP.WASM.Mon.Server
-    SOL_NAME: MP-WAMON
+#     SOL_NAME: MP-WAMON
-    NEXUS_PATH: MP-WAMON
+#     NEXUS_PATH: MP-WAMON
-  before_script:
+#   before_script:
-    - *nuget-fix
+#     - *nuget-fix
-    - dotnet restore "$env:SOL_NAME.sln"
+#     - dotnet restore "$env:SOL_NAME.sln"
-  only:
+#   only:
-    - develop
+#     - develop
-    - master
+#     - master
-  needs: ["WAMON:build"]
+#   needs: ["WAMON:build"]
-  script: 
+#   script: 
-    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:PROJ_PATH/$env:APP_NAME.csproj -o:publish
+#     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:PROJ_PATH/$env:APP_NAME.csproj -o:publish
-    # qui il deploy su nexus...
+#     # qui il deploy su nexus...
-    - *hashBuild
+#     - *hashBuild
-    - *nexusUpload
+#     - *nexusUpload
 
 LAND:release:
   stage: release
@@ -583,25 +583,26 @@ MON:release:
   script:
     - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj
 
-WAMON:release:
+# WAMON:release:
-  stage: release
+#   stage: release
-  tags:
+#   tags:
-    - win
+#     - win
-  variables:
+#   variables:
-    PROJ_PATH: MP.WASM.Mon\Server
+#     PROJ_PATH: MP.WASM.Mon\Server
-    APP_NAME: MP.WASM.Mon.Server
+#     APP_NAME: MP.WASM.Mon.Server
-    SOL_NAME: MP-WAMON
+#     SOL_NAME: MP-WAMON
-    NEXUS_PATH: MP-WAMON
+#     NEXUS_PATH: MP-WAMON
-  before_script:
+#   before_script:
-    - *nuget-fix
+#     - *nuget-fix
-    - dotnet restore "$env:SOL_NAME.sln"
+#     - dotnet restore "$env:SOL_NAME.sln"
-  only:
+#   only:
-    - tags
+#     - tags
-  except:
+#   except:
-    - branches
+#     - branches
-  needs: ["WAMON:build"]
+#   needs: ["WAMON:build"]
-  artifacts:
+#   artifacts:
-    paths:
+#     paths:
-      - publish/
+#       - publish/
-  script:
+#   script:
-    - dotnet publish -c Release -o ./publish $env:PROJ_PATH/$env:APP_NAME.csproj
+#     - dotnet publish -c Release -o ./publish $env:PROJ_PATH/$env:APP_NAME.csproj
+

MP.Mon/Components/DetailMSE.razor.cs

@@ -68,10 +68,6 @@ namespace MP.Mon.Components
                 }
                 if (needUpdate)
                 {
-                    if (false)
-                    {
-                        Log.Trace($"Elapsed Timer {CurrRecord?.CodMacchina}");
-                    }
                     await InvokeAsync(() => StateHasChanged());
                 }
                 OldRecord = CurrRecord;

MP.Mon/Data/MpDataService.cs

@@ -119,12 +119,12 @@ namespace MP.Mon.Data
         {
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
-            List<MappaStatoExpl> result = new List<MappaStatoExpl>();
+            List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
             // cerco in redis...
-            var rawData = await redisDb.StringGetAsync(redisMseKey);
+            RedisValue rawData = await redisDb.StringGetAsync(redisMseKey);
-            if (!string.IsNullOrEmpty(rawData))
+            if (rawData != RedisValue.Null || rawData != RedisValue.EmptyString)
             {
-                result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(rawData);
+                result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>($"{rawData}");
                 stopWatch.Stop();
                 TimeSpan ts = stopWatch.Elapsed;
                 Log.Debug($"Read from REDIS: {ts.TotalMilliseconds}ms");

MP.Mon/MP.Mon.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2207.1219</Version>
+    <Version>6.15.2207.1308</Version>
   </PropertyGroup>
 
   <ItemGroup>

MP.Mon/Pages/Index.razor.cs

@@ -61,7 +61,12 @@ namespace MP.Mon.Pages
 
         protected int slowRefreshMs
         {
-            get => 1000 * slowRefreshSec;
+            get
+            {
+                // tempo variabile tra +/- 10% del target
+                int answ = rnd.Next(900, 1100) * slowRefreshSec;
+                return answ;
+            }
         }
 
         #endregion Protected Properties
@@ -166,12 +171,10 @@ namespace MP.Mon.Pages
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
 
         private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
-
         private List<ConfigModel>? CurrConfig = null;
-
         private bool doBlink = false;
-
         private List<MappaStatoExpl>? listMSE = null;
+        private Random rnd = new Random();
 
         #endregion Private Fields
 

MP.Mon/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.15.2207.1219</h4>
+    <h4>Versione: 6.15.2207.1308</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.Mon/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2207.1219
+6.15.2207.1308

MP.Mon/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.1219</version>
+  <version>6.15.2207.1308</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>