Compare commits

...

4 Commits

Author SHA1 Message Date
Samuele Locatelli 5f422d3cc6 tolto gestione rilettura appconf mitigata (da testare meglio...) 2021-08-11 15:26:41 +02:00
Samuele Locatelli 5292da811b Merge branch 'develop' 2021-08-10 18:52:47 +02:00
Samuele Locatelli 8ec8e76fb5 Fix versione progetto con ddHH 2021-08-10 18:52:06 +02:00
Samuele Locatelli bfcd476190 Merge tag 'fixConcurrent_resetAppConf' into develop
Gestione semaforo x evitare reset multiplo in fase di rilettura appConf
2021-08-10 18:49:58 +02:00
3 changed files with 10 additions and 29 deletions
Vendored
+3 -6
View File
@@ -7,12 +7,9 @@ pipeline {
steps { steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */ /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script { script {
withEnv(['NEXT_BUILD_NUMBER=759']) { env.versionNumber = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumberBeta = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumber = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SteamWareLib'
env.versionNumberBeta = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SteamWareLib'
}
} }
script { script {
currentBuild.displayName = "${env.versionNumber}" currentBuild.displayName = "${env.versionNumber}"
+3 -11
View File
@@ -1950,16 +1950,8 @@ namespace SteamWare.IO
/// </summary> /// </summary>
public void resetAppConf() public void resetAppConf()
{ {
// controlo chiave x evitare doppio reset redDelKey(ACBH);
if (!string.IsNullOrEmpty(getRSV(CleaningKey))) startupAppConf();
{
//imposto veto 10 sec
setRSV(CleaningKey, DateTime.Now.ToString(), 10);
redDelKey(ACBH);
startupAppConf();
// veto 1 sec --> se ne va subito
setRSV(CleaningKey, "", 1);
}
} }
/// <summary> /// <summary>
@@ -2171,7 +2163,7 @@ namespace SteamWare.IO
/// <param name="valore"></param> /// <param name="valore"></param>
/// <param name="TTL_sec">in secondi</param> /// <param name="TTL_sec">in secondi</param>
/// <returns></returns> /// <returns></returns>
public bool setRSV(string chiave, string valore, int TTL_sec) public bool setRSV(string chiave, string valore, int TTL_sec = 5)
{ {
bool answ = false; bool answ = false;
try try
+4 -12
View File
@@ -1967,16 +1967,8 @@ namespace SteamWare
/// </summary> /// </summary>
public void resetAppConf() public void resetAppConf()
{ {
// controlo chiave x evitare doppio reset redDelKey(ACBH);
if (!string.IsNullOrEmpty(getRSV(CleaningKey))) startupAppConf();
{
//imposto veto 10 sec
setRSV(CleaningKey, DateTime.Now.ToString(), 10);
redDelKey(ACBH);
startupAppConf();
// veto 1 sec --> se ne va subito
setRSV(CleaningKey, "", 1);
}
} }
/// <summary> /// <summary>
@@ -2176,7 +2168,7 @@ namespace SteamWare
} }
catch (Exception exc) catch (Exception exc)
{ {
logger.lg.scriviLog(string.Format("Errore in setRSV:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); logger.lg.scriviLog(string.Format($"Errore in setRSV | chiave: {chiave} | valore: {valore}{Environment.NewLine}{exc}"), tipoLog.EXCEPTION);
} }
return answ; return answ;
} }
@@ -2200,7 +2192,7 @@ namespace SteamWare
} }
catch (Exception exc) catch (Exception exc)
{ {
logger.lg.scriviLog(string.Format("Errore in setRSV:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); logger.lg.scriviLog(string.Format($"Errore in setRSV | chiave: {chiave} | valore: {valore} | TTL: {TTL_sec}{Environment.NewLine}{exc}"), tipoLog.EXCEPTION);
} }
return answ; return answ;
} }