@@ -24,9 +23,9 @@
else
{
int currIdx = 0;
- foreach (var recordIob in ListMSE)
+ foreach (var recordIob in listMSE)
{
-
+
currIdx++;
if (currIdx >= maxCol)
{
@@ -38,8 +37,7 @@
int currNum = (currIdx % maxCol);
while (currNum < (maxCol))
{
- @((MarkupString)"
")
- ;
+ @((MarkupString)"
");
currNum++;
}
diff --git a/MP.Mon/Pages/Index.razor.cs b/MP.Mon/Pages/Index.razor.cs
index d028d1b9..c4409d3a 100644
--- a/MP.Mon/Pages/Index.razor.cs
+++ b/MP.Mon/Pages/Index.razor.cs
@@ -8,64 +8,39 @@ namespace MP.Mon.Pages
{
public partial class Index : IDisposable
{
- #region Protected Fields
-
- protected bool doAnimate = true;
- protected int fastRefreshSec = 10;
- protected int keepAliveMin = 1;
- protected List
? ListMSE = null;
- protected int maxCol = 4;
- protected string showArt = "";
- protected int slowRefreshSec = 300;
-
- #endregion Protected Fields
-
- #region Private Fields
-
- private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
- private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
- private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
- private List? CurrConfig = null;
-
- #endregion Private Fields
-
- #region Protected Properties
-
- protected int fastRefreshMs
- {
- get => 1000 * fastRefreshSec;
- }
-
- [Inject]
- protected MpDataService MMDataService { get; set; } = null!;
-
- [Inject]
- protected NavigationManager NavManager { get; set; } = null!;
-
- protected int slowRefreshMs
- {
- get => 1000 * slowRefreshSec;
- }
-
- #endregion Protected Properties
-
#region Public Methods
public void Dispose()
{
+#if false
fastTimer.Stop();
fastTimer.Dispose();
slowTimer.Stop();
slowTimer.Dispose();
+#endif
+ disposeTimers();
}
public void ElapsedFastTimer(object? source, System.Timers.ElapsedEventArgs e)
{
var pUpd = Task.Run(async () =>
{
- await ReloadData();
+ // secondi pari --> blink, secondi dispari --> ricarica
+ DateTime adesso = DateTime.Now;
+ int resto = 0;
+ Math.DivRem(adesso.Second, 2, out resto);
+ if (resto == 0)
+ {
+ doBlink = true;
+ Log.Trace("Elapsed Fast Timer Blink");
+ }
+ else
+ {
+ doBlink = false;
+ await ReloadData();
+ Log.Trace("Elapsed Fast Timer reload");
+ }
await Task.Delay(1);
- Log.Trace("Elapsed Fast Timer");
await InvokeAsync(StateHasChanged);
});
pUpd.Wait();
@@ -73,9 +48,12 @@ namespace MP.Mon.Pages
public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
{
- ListMSE = null;
+ listMSE = null;
await Task.Delay(1);
- Log.Trace("Elapsed Slow Timer");
+ Log.Info("Elapsed Slow Timer --> full page reload");
+ // dispongo i vari timers...
+ disposeTimers();
+ // reload pagina
NavManager.NavigateTo(NavManager.Uri);
}
@@ -95,6 +73,32 @@ namespace MP.Mon.Pages
#endregion Public Methods
+ #region Protected Fields
+
+ protected bool doAnimate = true;
+ protected int fastRefreshMs = 1000;
+ protected int keepAliveMin = 1;
+ protected int maxCol = 6;
+ protected string showArt = "";
+ protected int slowRefreshSec = 300;
+
+ #endregion Protected Fields
+
+ #region Protected Properties
+
+ [Inject]
+ protected MpDataService MMDataService { get; set; } = null!;
+
+ [Inject]
+ protected NavigationManager NavManager { get; set; } = null!;
+
+ protected int slowRefreshMs
+ {
+ get => 1000 * slowRefreshSec;
+ }
+
+ #endregion Protected Properties
+
#region Protected Methods
///
@@ -160,7 +164,8 @@ namespace MP.Mon.Pages
}
///
- /// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un dizionario x ottimizzare visualizzazione
+ /// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un
+ /// dizionario x ottimizzare visualizzazione
///
///
///
@@ -186,25 +191,42 @@ namespace MP.Mon.Pages
#endregion Protected Methods
+ #region Private Fields
+
+ private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
+ private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+ private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
+ private List? CurrConfig = null;
+ private bool doBlink = false;
+ private List? listMSE = null;
+
+ #endregion Private Fields
+
#region Private Methods
+ private void disposeTimers()
+ {
+ fastTimer.Elapsed -= ElapsedFastTimer;
+ fastTimer.Stop();
+ fastTimer.Dispose();
+ slowTimer.Elapsed -= ElapsedSlowTimer;
+ slowTimer.Stop();
+ slowTimer.Dispose();
+ }
+
private async Task ReloadData()
{
+#if DEBUG
// hack: legge 4 volte i dati x stressare sistema
- bool stressTest = false;
- if (stressTest)
+ var singleData = await MMDataService.MseGetAll();
+ listMSE = new List();
+ for (int i = 0; i < 4; i++)
{
- var singleData = await MMDataService.MseGetAll();
- ListMSE = singleData.ToList();
- for (int i = 0; i < 3; i++)
- {
- ListMSE.AddRange(singleData);
- }
- }
- else
- {
- ListMSE = await MMDataService.MseGetAll();
+ listMSE.AddRange(singleData);
}
+#else
+ listMSE = await MMDataService.MseGetAll();
+#endif
}
private async Task setupConf()
@@ -220,10 +242,9 @@ namespace MP.Mon.Pages
getConfValInt("doAnimate", ref intDoAnim);
doAnimate = intDoAnim == 1;
getConfValInt("pageRefreshSec", ref slowRefreshSec);
- getConfValInt("MSE_cacheDuration", ref fastRefreshSec);
getConfVal("sART", ref showArt);
- Log.Info($"Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshSec: {fastRefreshSec}");
+ Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshMs: {fastRefreshMs}");
}
}
diff --git a/MP.Mon/Pages/_Layout.cshtml b/MP.Mon/Pages/_Layout.cshtml
index 49d12f15..ad3cb392 100644
--- a/MP.Mon/Pages/_Layout.cshtml
+++ b/MP.Mon/Pages/_Layout.cshtml
@@ -30,14 +30,6 @@
@*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
-
-
-
-
+ 
+