Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f422d3cc6 | |||
| 5292da811b | |||
| 8ec8e76fb5 | |||
| bfcd476190 |
Vendored
+3
-6
@@ -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}"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user