Merge branch 'release/fixSe'

Riprostinato metodo init appConf

Jenkinsfile

@@ -7,12 +7,9 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=759']) {
-          // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
-          env.versionNumber = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
-          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'
-        }
+        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.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.APP_NAME = 'SteamWareLib'
       }				
       script {
         currentBuild.displayName = "${env.versionNumber}"

SteamWare.IO/memLayer.cs

@@ -1950,16 +1950,8 @@ namespace SteamWare.IO
         /// </summary>
         public void resetAppConf()
         {
-            // controlo chiave x evitare doppio reset
-            if (!string.IsNullOrEmpty(getRSV(CleaningKey)))
-            {
-                //imposto veto 10 sec
-                setRSV(CleaningKey, DateTime.Now.ToString(), 10);
-                redDelKey(ACBH);
-                startupAppConf();
-                // veto 1 sec --> se ne va subito
-                setRSV(CleaningKey, "", 1);
-            }
+            redDelKey(ACBH);
+            startupAppConf();
         }
 
         /// <summary>
@@ -2152,14 +2144,28 @@ namespace SteamWare.IO
         public bool setRSV(string chiave, string valore)
         {
             bool answ = false;
-            try
+            if (!string.IsNullOrEmpty(chiave))
             {
-                cache.StringSet(chiave, valore);
-                answ = true;
+                if (!string.IsNullOrEmpty(valore))
+                {
+                    try
+                    {
+                        cache.StringSet(chiave, valore);
+                        answ = true;
+                    }
+                    catch (Exception exc)
+                    {
+                        Logging.Instance.Error(string.Format("Eccezzione in setRSV:{0}{1}", Environment.NewLine, exc));
+                    }
+                }
+                else
+                {
+                    Logging.Instance.Error("Errore: valore non valido (vuoto) in setRSV");
+                }
             }
-            catch (Exception exc)
+            else
             {
-                Logging.Instance.Error(string.Format("Eccezzione in setRSV:{0}{1}", Environment.NewLine, exc));
+                Logging.Instance.Error("Errore: chiave non valida (vuota) in setRSV");
             }
             return answ;
         }
@@ -2171,7 +2177,7 @@ namespace SteamWare.IO
         /// <param name="valore"></param>
         /// <param name="TTL_sec">in secondi</param>
         /// <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;
             try

SteamWareLib/memLayer.cs

@@ -1967,16 +1967,8 @@ namespace SteamWare
         /// </summary>
         public void resetAppConf()
         {
-            // controlo chiave x evitare doppio reset
-            if (!string.IsNullOrEmpty(getRSV(CleaningKey)))
-            {
-                //imposto veto 10 sec
-                setRSV(CleaningKey, DateTime.Now.ToString(), 10);
-                redDelKey(ACBH);
-                startupAppConf();
-                // veto 1 sec --> se ne va subito
-                setRSV(CleaningKey, "", 1);
-            }
+            redDelKey(ACBH);
+            startupAppConf();
         }
 
         /// <summary>
@@ -2169,14 +2161,28 @@ namespace SteamWare
         public bool setRSV(string chiave, string valore)
         {
             bool answ = false;
-            try
+            if (!string.IsNullOrEmpty(chiave))
             {
-                cache.StringSet(chiave, valore);
-                answ = true;
+                if (!string.IsNullOrEmpty(valore))
+                {
+                    try
+                    {
+                        cache.StringSet(chiave, valore);
+                        answ = true;
+                    }
+                    catch (Exception exc)
+                    {
+                        logger.lg.scriviLog($"Eccezzione in setRSV | chiave: {chiave} | valore: {valore}{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
+                    }
+                }
+                else
+                {
+                    logger.lg.scriviLog("Errore: valore non valido (vuoto) in setRSV", tipoLog.ERROR);
+                }
             }
-            catch (Exception exc)
+            else
             {
-                logger.lg.scriviLog(string.Format("Errore in setRSV:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
+                logger.lg.scriviLog("Errore: chiave non valida (vuota) in setRSV", tipoLog.ERROR);
             }
             return answ;
         }
@@ -2200,7 +2206,7 @@ namespace SteamWare
             }
             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;
         }