Fix gestione reset e fix chiusura setup con IOB

This commit is contained in:
Samuele E. Locatelli
2019-10-11 12:12:10 +02:00
parent 973c5df5ca
commit b77b5ffcdf
3 changed files with 36 additions and 3 deletions
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1236']) {
withEnv(['NEXT_BUILD_NUMBER=1237']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+11 -1
View File
@@ -275,7 +275,17 @@ namespace MP_IO.Controllers
connDb.scriviKeepAlive(id, DateTime.Now);
try
{
DataLayer.remTask4Machine(id, taskName);
// converto stringa in tipo task...
taskType tName = taskType.nihil;
bool fatto = Enum.TryParse(taskName, out tName);
if (fatto)
{
DataLayer.remTask4Machine(id, tName);
}
else
{
logger.lg.scriviLog($"remTask2Exe: impossibile riconoscere il comando {taskName} come uno deitipi ammessi, NON aggiunto", tipoLog.ERROR);
}
answ = getTask2Exe(id);
}
catch
+24 -1
View File
@@ -1171,6 +1171,29 @@ namespace MapoDb
{ }
return answ;
}
/// <summary>
/// RIMUOVE un task dall'elenco di quelli salvati
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="taskKey"></param>
/// <returns></returns>
public static bool remTask4Machine(string idxMacchina, taskType taskKey)
{
bool answ = false;
string currHash = exeTaskHash(idxMacchina);
try
{
// leggo task attuali...
var currTask = mTaskMacchina(idxMacchina);
currTask.Remove(taskKey.ToString());
memLayer.ML.redDelKey(currHash);
answ = memLayer.ML.redSaveHashDict(currHash, currTask);
logger.lg.scriviLog($"Task REM - idxMacchina: {idxMacchina} | taskKey: {taskKey.ToString()}");
}
catch
{ }
return answ;
}
#if false
/// <summary>
/// Aggiunge un task all'elenco di quelli salvati (in modalità upsert)
@@ -1195,7 +1218,6 @@ namespace MapoDb
{ }
return answ;
}
#endif
/// <summary>
/// RIMUOVE un task dall'elenco di quelli salvati
/// </summary>
@@ -1219,6 +1241,7 @@ namespace MapoDb
{ }
return answ;
}
#endif
#endregion