diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index e408a0d..283ca58 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2420
+ 1.2.2210.2510
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index c1d4f3a..b4df63b 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2210.2420
+ Version: 1.2.2210.2510
Release Note:
-
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 0a68100..1bb5e2e 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2420
+1.2.2210.2510
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index fd573ad..db2b96b 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2420
+ 1.2.2210.2510
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.Core/Constants.cs b/MP.MONO.Core/Constants.cs
index 87c0fcf..320a549 100644
--- a/MP.MONO.Core/Constants.cs
+++ b/MP.MONO.Core/Constants.cs
@@ -46,6 +46,7 @@ namespace MP.MONO.Core
public static readonly string ALARM_ACT_KEY = $"{BASE_HASH}:Current:AlarmsVal";
public static readonly string ALARM_BLINK_CURR_KEY = $"{BASE_HASH}:Current:AlarmsBlink";
public static readonly string ALARM_CURR_KEY = $"{BASE_HASH}:Current:Alarms";
+ public static readonly string ALARM_LOG_SAVED = $"{BASE_HASH}:Current:AlarmsLogSaved";
public static readonly string ALARM_RECEIV_KEY = $"{BASE_HASH}:Current:AlarmsReceived";
public static readonly string ALARM_PEND_KEY = $"{BASE_HASH}:Current:AlarmsPendingClose";
public static readonly string EVENT_LOG_CURR_KEY = $"{BASE_HASH}:Current:EventsLog";
diff --git a/MP.MONO.DECODER/AlarmsBlinkManager.cs b/MP.MONO.DECODER/AlarmsBlinkManager.cs
index 74ab9b7..981f7c0 100644
--- a/MP.MONO.DECODER/AlarmsBlinkManager.cs
+++ b/MP.MONO.DECODER/AlarmsBlinkManager.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.Extensions.Configuration;
using MP.MONO.Core;
using MP.MONO.Data;
using MP.MONO.Data.Controllers;
@@ -6,6 +7,7 @@ using MP.MONO.Data.DbModels;
using Newtonsoft.Json;
using NLog;
using StackExchange.Redis;
+using System.Collections.Concurrent;
namespace MP.MONO.DECODER
{
@@ -54,30 +56,8 @@ namespace MP.MONO.DECODER
///
public static List alarmsActAck
{
- get
- {
- List answ = new List();
- if (useRedis)
- {
- answ = getAlarms("Current");
- }
- else
- {
- answ = _alarmsActAck;
- }
- return answ;
- }
- set
- {
- if (useRedis)
- {
- setAlarms("Current", value);
- }
- else
- {
- _alarmsActAck = value;
- }
- }
+ get => getAlarms(redisDb.StringGet(Constants.ALARM_CURR_KEY));
+ set => setAlarms(Constants.ALARM_CURR_KEY, value);
}
///
@@ -85,30 +65,8 @@ namespace MP.MONO.DECODER
///
public static List alarmsLastRec
{
- get
- {
- List answ = new List();
- if (useRedis)
- {
- answ = getAlarms("LastReceived");
- }
- else
- {
- answ = _alarmsLastRec;
- }
- return answ;
- }
- set
- {
- if (useRedis)
- {
- setAlarms("LastReceived", value);
- }
- else
- {
- _alarmsLastRec = value;
- }
- }
+ get => getAlarms(redisDb.StringGet(Constants.ALARM_RECEIV_KEY));
+ set => setAlarms(Constants.ALARM_RECEIV_KEY, value);
}
///
@@ -116,8 +74,8 @@ namespace MP.MONO.DECODER
///
public static string alarmsLogSaved
{
- get => _alarmsLogSaved;
- set => _alarmsLogSaved = value;
+ get => redisDb.StringGet(Constants.ALARM_LOG_SAVED);
+ set => redisDb.StringSet(Constants.ALARM_LOG_SAVED, value);
}
public static List alarmsPendingClose
@@ -127,27 +85,21 @@ namespace MP.MONO.DECODER
// rileggo da REDIS SE ci sono allarmi che sono pending close... in un area che dura poco (2 sec)
List lista = new List();
// in base al tipo leggo una chiave redis o l'altra...
- if (redisDb != null)
+ string rawData = redisDb.StringGet(Constants.ALARM_PEND_KEY);
+ if (!string.IsNullOrEmpty(rawData))
{
- string rawData = redisDb.StringGet(Constants.ALARM_PEND_KEY);
- if (!string.IsNullOrEmpty(rawData))
+ var desList = JsonConvert.DeserializeObject>(rawData);
+ if (desList != null)
{
- var desList = JsonConvert.DeserializeObject>(rawData);
- if (desList != null)
- {
- lista = desList;
- }
+ lista = desList;
}
}
return lista;
}
set
{
- if (redisDb != null)
- {
- string rawData = JsonConvert.SerializeObject(value);
- redisDb.StringSet(Constants.ALARM_PEND_KEY, rawData, TimeSpan.FromMilliseconds(3000));
- }
+ string rawData = JsonConvert.SerializeObject(value);
+ redisDb.StringSet(Constants.ALARM_PEND_KEY, rawData, TimeSpan.FromMilliseconds(3000));
}
}
@@ -155,6 +107,61 @@ namespace MP.MONO.DECODER
#region Public Methods
+ public static bool isProcessing { get; set; } = false;
+ private static int ticketNum { get; set; } = 0;
+
+ private static ConcurrentQueue reqList { get; set; } = new ConcurrentQueue();
+
+ ///
+ /// Recupera un ticket di esecuzione x eseguire in ordine corretto gli insert...
+ ///
+ ///
+ public static int getTicket()
+ {
+ // incremento contatore
+ ticketNum++;
+ // faccio coda 0...999
+ ticketNum = ticketNum > 99 ? 1 : ticketNum;
+ // accodo...
+ reqList.Enqueue(ticketNum);
+ // rendo ticket
+ return ticketNum;
+ }
+
+ ///
+ /// Indica il ticket attualmente in esecuzione
+ ///
+ ///
+ public static int currTicket
+ {
+ get
+ {
+ int answ = -1;
+ reqList.TryPeek(out answ);
+ return answ;
+ }
+ }
+ ///
+ /// Verifico se il mio ticket sia quello corretto/prossimo
+ ///
+ ///
+ ///
+ public static bool checklTicket(int ticket)
+ {
+ bool fatto = false;
+ if (!isProcessing)
+ {
+ // verifico se quello richiesto sia il ticket giusto
+ if (ticket == currTicket)
+ {
+ isProcessing = true;
+ int usedTicket = 0;
+ fatto = reqList.TryDequeue(out usedTicket);
+ }
+ }
+ return fatto;
+ }
+
///
/// restituisce elenco allarmi muted, eventualmente da cache redis ( 5 sec)
///
@@ -166,39 +173,36 @@ namespace MP.MONO.DECODER
List mutedAlarm = new List();
string rawData = "";
// cerco in redis...
- if (redisDb != null)
+ rawData = redisDb.StringGet(Constants.ALARMS_SETT_MUTED_KEY);
+ if (!string.IsNullOrEmpty(rawData))
{
- rawData = redisDb.StringGet(Constants.ALARMS_SETT_MUTED_KEY);
+ var rawAlarm = JsonConvert.DeserializeObject>(rawData);
+ if (rawAlarm != null)
+ {
+ mutedAlarm = rawAlarm;
+ }
+ }
+ else
+ {
+ // altrimenti da conf/DB... gestione allarmi muted
+ List? alarmListSetup = new List();
+ rawData = redisDb.StringGet(Constants.ALARMS_SETT_RLIST_KEY);
if (!string.IsNullOrEmpty(rawData))
{
- var rawAlarm = JsonConvert.DeserializeObject>(rawData);
- if (rawAlarm != null)
- {
- mutedAlarm = rawAlarm;
- }
+ alarmListSetup = JsonConvert.DeserializeObject>(rawData);
}
- else
+ if (alarmListSetup == null)
{
- // altrimenti da conf/DB... gestione allarmi muted
- List? alarmListSetup = new List();
- rawData = redisDb.StringGet(Constants.ALARMS_SETT_RLIST_KEY);
- if (!string.IsNullOrEmpty(rawData))
- {
- alarmListSetup = JsonConvert.DeserializeObject>(rawData);
- }
- if (alarmListSetup == null)
- {
- alarmListSetup = dbController.AlarmListGetAll();
- }
- // calcolo come lista string...
- if (alarmListSetup != null && alarmListSetup.Count > 0)
- {
- mutedAlarm = alarmListSetup.Where(x => x.Muted).Select(x => x.FullValue).ToList();
- }
- // salvo cache in redis x 1 minuto...
- rawData = JsonConvert.SerializeObject(mutedAlarm);
- redisDb.StringSet(Constants.ALARMS_SETT_MUTED_KEY, rawData, TimeSpan.FromSeconds(60));
+ alarmListSetup = dbController.AlarmListGetAll();
}
+ // calcolo come lista string...
+ if (alarmListSetup != null && alarmListSetup.Count > 0)
+ {
+ mutedAlarm = alarmListSetup.Where(x => x.Muted).Select(x => x.FullValue).ToList();
+ }
+ // salvo cache in redis x 1 minuto...
+ rawData = JsonConvert.SerializeObject(mutedAlarm);
+ redisDb.StringSet(Constants.ALARMS_SETT_MUTED_KEY, rawData, TimeSpan.FromSeconds(60));
}
return mutedAlarm;
}
@@ -317,9 +321,7 @@ namespace MP.MONO.DECODER
private static ConnectionMultiplexer? redisConn = null;
- private static IDatabase? redisDb = null;
-
- private static bool useRedis = true;
+ private static IDatabase redisDb = null!;
private static MpDbController dbController = null!;
@@ -327,76 +329,38 @@ namespace MP.MONO.DECODER
#region Private Properties
- ///
- /// Elenco allarmi attivi e acknowled ad es: subito i nuovi, con ritardo i cessati
- ///
- private static List _alarmsActAck { get; set; } = new List();
-
- ///
- /// Elenco ultimo set allarmi ricevuti
- ///
- private static List _alarmsLastRec { get; set; } = new List();
-
- ///
- /// Elenco allarmi registrati come LOG (=ultima variazione riconosciuta)
- ///
- private static string _alarmsLogSaved { get; set; } = "";
#endregion Private Properties
#region Private Methods
///
- /// Recupero da redis gli allarmi secondo tipo LastReceived / Current
+ /// Converto deserializzando lista allarmi
///
- private static List getAlarms(string tipo)
+ private static List getAlarms(string rawData)
{
- // rileggo da REDIS la conf attuale allarmi già attivi da area ALARM_CURR_KEY
List lastAlarms = new List();
- // in base al tipo leggo una chiave redis o l'altra...
- string rawData = "";
- if (redisDb != null)
- {
- if (tipo == "LastReceived")
- {
- rawData = redisDb.StringGet(Constants.ALARM_RECEIV_KEY);
- }
- else
- {
- rawData = redisDb.StringGet(Constants.ALARM_CURR_KEY);
- }
- }
// se trovati uso questi...
if (!string.IsNullOrEmpty(rawData))
{
var rawLastAlarms = JsonConvert.DeserializeObject>(rawData);
lastAlarms = rawLastAlarms != null ? rawLastAlarms : new List();
- Log.Debug($"Lettura allarmi | tipo: {tipo} | num: {lastAlarms.Count}");
}
return lastAlarms;
}
///
- /// Salvo in redis gli allarmi secondo tipo LastReceived / Sent
+ /// Salvo in redis gli allarmi datala key
///
- private static bool setAlarms(string tipo, List listAlarm)
+ ///
+ ///
+ ///
+ private static bool setAlarms(string keyName, List listAlarm)
{
bool fatto = false;
string rawData = JsonConvert.SerializeObject(listAlarm);
-
- if (redisDb != null)
- {
- if (tipo == "LastReceived")
- {
- fatto = redisDb.StringSet(Constants.ALARM_RECEIV_KEY, rawData);
- }
- else
- {
- fatto = redisDb.StringSet(Constants.ALARM_CURR_KEY, rawData);
- }
- }
-
- Log.Debug($"Scrittura allarmi | tipo: {tipo} | num: {listAlarm.Count}");
+ fatto = redisDb.StringSet(keyName, rawData);
+ Log.Debug($"Scrittura allarmi | key: {keyName} | num: {listAlarm.Count}");
return fatto;
}
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index fee7fa8..2f5c8c2 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2420
+ 1.2.2210.2511
diff --git a/MP.MONO.DECODER/NLog.config b/MP.MONO.DECODER/NLog.config
index 1d977dc..f3b990c 100644
--- a/MP.MONO.DECODER/NLog.config
+++ b/MP.MONO.DECODER/NLog.config
@@ -51,7 +51,8 @@
-->
-
+
+
\ No newline at end of file
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index 1067dec..7db3e51 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -9,6 +9,7 @@ using MP.MONO.DECODER;
using Newtonsoft.Json;
using NLog;
using Org.BouncyCastle.Asn1.Pkcs;
+using Pomelo.EntityFrameworkCore.MySql.Query.Internal;
using StackExchange.Redis;
using System.Diagnostics;
using System.Reflection;
@@ -379,6 +380,8 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
List alarmRecList = new List();
List alarmLogList = new List();
+ Random rand = new Random();
+
if (alarmMode == AlarmReportingMode.RawList)
{
try
@@ -596,7 +599,14 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
// salvo sul DB
if (alarmRecList.Count > 0)
{
- _ = dbController.AlarmRecInsertMany(alarmRecList);
+ foreach (var item in alarmRecList)
+ {
+ _ = dbController.AlarmRecInsert(item);
+ await Task.Delay(10);
+ }
+#if false
+ _ = dbController.AlarmRecInsertMany(alarmRecList);
+#endif
}
if (alarmLogList.Count > 0)
{
@@ -611,11 +621,30 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
}
else if (alarmMode == AlarmReportingMode.RawListBlink)
{
+ int numTry = 0;
+ int myTicket = 0;
+ Stopwatch stopWatch = new Stopwatch();
try
{
+ myTicket = AlarmsBlinkManager.getTicket();
+ // attendo che NON ci siano altri processi in coda...
+ while (!AlarmsBlinkManager.checklTicket(myTicket))
+ {
+ await Task.Delay(rand.Next(10, 30));
+ if (numTry % 10 == 0)
+ {
+ TimeSpan ts = DateTime.Now.Subtract(adesso);
+ Log.Info($"Ticket {myTicket} | total wait {ts.TotalMilliseconds:N3}ms");
+ }
+ numTry++;
+ }
+
+ stopWatch.Start();
+ Log.Debug($"---------- INIZIO ticket {myTicket} ---------- ");
+
// decodifico allarmi ricevuti
var alarmListRaw = JsonConvert.DeserializeObject>(currArgs.newMessage);
- var alarmListRcvd = alarmListRaw != null ? alarmListRaw : new List();
+ var alarmListRcvd = alarmListRaw != null ? alarmListRaw : new List();
// bonifico allarmi
var alarmiListClean = AlarmsBlinkManager.cleanAlarms(AlarmCleanPre, AlarmCleanPost, alarmListRcvd);
@@ -633,7 +662,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
alarmsSendPipe.saveAndSendMessage(Constants.ALARM_CURR_KEY, serAlarms);
// se cambiato --> ultimo ricevuto != current...
- string lastLogList = AlarmsBlinkManager.alarmsLogSaved;
+ string lastLogList = AlarmsBlinkManager.alarmsLogSaved != null ? AlarmsBlinkManager.alarmsLogSaved : "";
// calcolo nuova stringa...
string newLogString = string.Join(", ", alarmiListClean);
bool logChanged = !lastLogList.Equals(newLogString);
@@ -677,6 +706,12 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
}
}
// salvo sul DB
+#if false
+ foreach (var item in alarmRecList)
+ {
+ _ = dbController.AlarmRecInsert(item);
+ }
+#endif
_ = dbController.AlarmRecInsertMany(alarmRecList);
Log.Debug($"Inseriti {alarmRecList.Count} Records AlarmRecModel");
}
@@ -685,18 +720,23 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
// chiamo task x verifica chiusura ritardata
foreach (var item in ceasedAlarms)
{
- await Task.Run(async () =>
+ await Task.Run(() =>
{
- await checkCeasedAlarm(item);
+ checkCeasedAlarm(item);
});
- await Task.Delay(10);
}
// Loggo quanto fatto
Log.Debug($"Chiamato controllo differito per {ceasedAlarms.Count} allarmi cessati");
}
}
- catch
- { }
+ catch (Exception exc)
+ {
+ Log.Error($"Eccezione:{Environment.NewLine}{exc}");
+ }
+ AlarmsBlinkManager.isProcessing = false;
+
+ stopWatch.Stop();
+ Log.Debug($"---------- Fine ticket {myTicket} | {stopWatch.ElapsedMilliseconds} ms ---------- ");
}
else
{
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index c1d4f3a..1d44c62 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.2420
+ Version: 1.2.2210.2511
Release Note:
-
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 0a68100..123fddb 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2420
+1.2.2210.2511
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index 855c6ae..5279630 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2420
+ 1.2.2210.2511
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.DECODER/appsettings.json b/MP.MONO.DECODER/appsettings.json
index 3f3b4bb..17f1316 100644
--- a/MP.MONO.DECODER/appsettings.json
+++ b/MP.MONO.DECODER/appsettings.json
@@ -41,6 +41,6 @@
//"AlarmRegexp": "^{.*}",
"BlinkCount": 3,
"DbSampleInt": 60,
- "BlinkPeriodMSec": 1200
+ "BlinkPeriodMSec": 2000
}
}
diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs
index 7e1fafb..8c95cfd 100644
--- a/MP.MONO.Data/Controllers/MpDbController.cs
+++ b/MP.MONO.Data/Controllers/MpDbController.cs
@@ -506,18 +506,39 @@ namespace MP.MONO.Data.Controllers
bool fatto = false;
using (MapoMonoContext localDbCtx = new MapoMonoContext())
{
+ Stopwatch stopWatch = new Stopwatch();
+ stopWatch.Start();
try
{
- localDbCtx
- .DbSetAlarmRec
- .Add(newItem);
- await localDbCtx.SaveChangesAsync();
- fatto = true;
+ // verifico non sia già aperto...
+ // verifico eventuali items già aperti da NON dover aggiungere...
+ var stillOpenAlarms = localDbCtx
+ .DbSetAlarmRec
+ .Where(x => x.DtStart >= x.DtEnd && x.AlarmId == newItem.AlarmId)
+ .Select(x=> x.AlarmId)
+ .ToList();
+
+ // se ho trovato --> salto!
+ if (stillOpenAlarms != null && stillOpenAlarms.Count > 0)
+ {
+ Log.Error($"Errore: trovato {stillOpenAlarms.Count} istanze già attive | Id: {newItem.AlarmId}");
+ }
+ else
+ {
+ localDbCtx
+ .DbSetAlarmRec
+ .Add(newItem);
+ await localDbCtx.SaveChangesAsync();
+ fatto = true;
+ }
}
catch (Exception exc)
{
Log.Error($"Eccezione durante AlarmRecInsert{Environment.NewLine}{exc}");
}
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Info($"AlarmRecInsert| DB insert 1 rec | {ts.TotalMilliseconds} ms");
}
return fatto;
}
@@ -538,6 +559,7 @@ namespace MP.MONO.Data.Controllers
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
+#if false
// verifico eventuali items già aperti da NON dover aggiungere...
List? stillOpenAlarms = localDbCtx
.DbSetAlarmRec
@@ -564,7 +586,8 @@ namespace MP.MONO.Data.Controllers
newItems.Remove(singleItem);
}
}
- }
+ }
+#endif
if (newItems.Count > 0)
{
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index 88c7247..7a7c636 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2420
+ 1.2.2210.2510
diff --git a/MP.MONO.SIM/Program.cs b/MP.MONO.SIM/Program.cs
index edefa33..027fa2d 100644
--- a/MP.MONO.SIM/Program.cs
+++ b/MP.MONO.SIM/Program.cs
@@ -324,7 +324,7 @@ void simAlarms()
newAlarm = rand.Next(0, 100) <= percAllarmi;
if (newAlarm)
{
- int numNew = rand.Next(1, MaxAddAllarmi);
+ int numNew = rand.Next(2, MaxAddAllarmi);
// ciclo x aggiungere il numero di allarmi indicato
for (int i = 0; i < numNew; i++)
{
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index c1d4f3a..b4df63b 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.2420
+ Version: 1.2.2210.2510
Release Note:
-
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 0a68100..1bb5e2e 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2420
+1.2.2210.2510
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index abb41f8..d0dfa91 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2420
+ 1.2.2210.2510
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.SIM/appsettings.json b/MP.MONO.SIM/appsettings.json
index 6633fff..2ff1dc6 100644
--- a/MP.MONO.SIM/appsettings.json
+++ b/MP.MONO.SIM/appsettings.json
@@ -45,7 +45,7 @@
"MinSaveIntSec": 5,
"PercAllarmi": 60,
//"PercAllarmi": 20,
- "MaxAddAllarmi": 6,
+ "MaxAddAllarmi": 10,
"MaxDurationAllarmi": 30,
"PeriodRefresh": 10,
"PeriodOk": 10,
diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs
index fdb7481..023c021 100644
--- a/MP.MONO.UI/Data/CurrentDataService.cs
+++ b/MP.MONO.UI/Data/CurrentDataService.cs
@@ -142,7 +142,7 @@ namespace MP.MONO.UI.Data
{
dbResult = await dbController.AlarmLogGetFilt(machineId, skipRec, numRec);
rawData = JsonConvert.SerializeObject(dbResult);
- await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromMilliseconds(1000));
+ await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromMilliseconds(250));
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
@@ -216,7 +216,7 @@ namespace MP.MONO.UI.Data
{
dbResult = await dbController.AlarmRecGetFilt(MachineId, skipRec, numRec);
rawData = JsonConvert.SerializeObject(dbResult);
- await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromMilliseconds(1000));
+ await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromMilliseconds(250));
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index d57358c..0ab7d24 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2509
+ 1.2.2210.2510
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index da42a7f..b4df63b 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.2509
+ Version: 1.2.2210.2510
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 611af81..1bb5e2e 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2509
+1.2.2210.2510
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 7136593..cab5b46 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2509
+ 1.2.2210.2510
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html
false