From e48d9cdbc6fd9e2bbd2f725813df266762ca27a2 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 9 Oct 2020 08:41:13 +0200
Subject: [PATCH] File delete file gestito come try/catch (SE bloccati...)

---
 IOB-WIN/IobFileEurom63.cs | 44 +++++++++++++++++++--------------------
 Jenkinsfile               |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/IOB-WIN/IobFileEurom63.cs b/IOB-WIN/IobFileEurom63.cs
index 0d803c3d..7db32bb4 100644
--- a/IOB-WIN/IobFileEurom63.cs
+++ b/IOB-WIN/IobFileEurom63.cs
@@ -38,9 +38,9 @@ namespace IOB_WIN
         protected CachedString Last_CurrStatus = new CachedString() { Value = "00000" };
 
         /// <summary>
-        /// Massimo delay lettura dati prima di considerarli scaduti (59 sec, ma x test 1 gg)
+        /// Massimo delay lettura dati prima di considerarli scaduti (30 sec, ma x test 1 gg)
         /// </summary>
-        protected int maxDelaySec = 59;
+        protected int maxDelaySec = 30;
 
         #endregion Protected Fields
 
@@ -167,7 +167,12 @@ namespace IOB_WIN
                     string[] file2del = Directory.GetFiles(BaseDir, searchPattern);
                     foreach (var file in file2del)
                     {
-                        File.Delete(file);
+                        try
+                        {
+                            File.Delete(file);
+                        }
+                        catch
+                        { }
                     }
                 }
             }
@@ -375,25 +380,16 @@ namespace IOB_WIN
                 string[] file2del = Directory.GetFiles(BaseDir, cleanExt);
                 foreach (var file in file2del)
                 {
-                    File.Delete(file);
+                    try
+                    {
+                        File.Delete(file);
+                    }
+                    catch
+                    { }
                 }
             }
         }
 
-#if false
-        /// <summary>
-        /// Pulizia folder da tutti i file RSP
-        /// </summary>
-        internal void cleanupResp()
-        {
-            string[] file2del = Directory.GetFiles(BaseDir, "*.RSP");
-            foreach (var file in file2del)
-            {
-                File.Delete(file);
-            }
-        }
-#endif
-
         /// <summary>
         /// Pulizia folder dai file RSP della sessione
         /// </summary>
@@ -402,7 +398,12 @@ namespace IOB_WIN
             string[] file2del = Directory.GetFiles(BaseDir, $"{sessionName}.RSP");
             foreach (var file in file2del)
             {
-                File.Delete(file);
+                try
+                {
+                    File.Delete(file);
+                }
+                catch
+                { }
             }
         }
 
@@ -660,10 +661,9 @@ namespace IOB_WIN
                                         { }
                                         if (Math.Abs(lastPub.Subtract(adesso).TotalSeconds) > maxDelaySec)
                                         {
-#if false
-                                            sessStatus.Active = false;
-#endif
                                             sessStatus.SessionValidUntil = adesso;
+                                            // elimino file RSP...
+                                            cleanupResp(sessStatus.SessionName);
                                         }
                                     }
                                 }
diff --git a/Jenkinsfile b/Jenkinsfile
index 48c3f651..6bd6586a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=713']) {
+        withEnv(['NEXT_BUILD_NUMBER=714']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'