From f7ee2c4eec631d4ff2b6aa0cac1fedd6223f6db9 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 1 Dec 2020 12:12:43 +0100
Subject: [PATCH 1/4] fix nlog x IOB-MAN

---
 IOB-MAN/NLog.config | 77 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 58 insertions(+), 19 deletions(-)

diff --git a/IOB-MAN/NLog.config b/IOB-MAN/NLog.config
index 7a0f3aa1..ff4a5d80 100644
--- a/IOB-MAN/NLog.config
+++ b/IOB-MAN/NLog.config
@@ -6,36 +6,75 @@
       throwExceptions="false"
       internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
 
-  <!-- optional, add some variables
+    <!-- optional, add some variables
   https://github.com/nlog/NLog/wiki/Configuration-file#variables
   -->
-  <variable name="myvar" value="myvalue"/>
+    <variable name="logDir" value="${basedir}/logs" />
 
-  <!--
+    <!--
   See https://github.com/nlog/nlog/wiki/Configuration-file
   for information on customizing logging rules and outputs.
    -->
-  <targets>
-
-    <!--
+    <targets>
+        <!--
     add your targets here
     See https://github.com/nlog/NLog/wiki/Targets for possible targets.
     See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
     -->
+        <target xsi:type="File"
+            name="f_base"
+            fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
+            layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}"
+            archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.log"
+            archiveNumbering="Sequence"
+            archiveAboveSize="10240000"
+            maxArchiveFiles="60"
+            enableArchiveFileCompression="false"
+            keepFileOpen="false" />
+        <target xsi:type="File"
+            name="f_error"
+            fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
+            layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}${newline}${exception:format=tostring}"
+            archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.log"
+            archiveNumbering="Sequence"
+            archiveAboveSize="10240000"
+            maxArchiveFiles="60"
+            enableArchiveFileCompression="false"
+            keepFileOpen="false" />
+        <!--Target per asp.net 4.5+ (NON VA con 4.0 common-->
+        <!--<target xsi:type="File"
+      name="f"
+      fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
+      layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}|${exception:format=tostring}"
+      archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.zip"
+      archiveNumbering="Sequence"
+      archiveEvery="Day"
+      archiveOldFileOnStartup="true"
+      maxArchiveFiles="90"
+      enableArchiveFileCompression="true"
+      keepFileOpen="true"
+    />-->
+        <!--<target name="fAsync" xsi:type="AsyncWrapper" queueLimit="5" overflowAction="Discard">
+      <target xsi:type="File"
+        keepFileOpen="true"
+        fileName="${basedir}/logs/${shortdate}_${var:codIOB:default=0000}.log"
+        layout="${longdate}|${uppercase:${level}}|${var:codIOB:default=0000}|${callsite}|${message}|${exception:format=tostring}"
+        archiveFileName="${basedir}/logs/${shortdate}_${var:codIOB:default=0000}.{###}.zip"
+        archiveNumbering="Sequence"
+        archiveEvery="Day"
+        archiveOldFileOnStartup="true"
+        maxArchiveFiles="0"
+        enableArchiveFileCompression="true" />
+    </target>-->
+    </targets>
 
-    <!--
-    Write events to a file with the date in the filename.
-    <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
-            layout="${longdate} ${uppercase:${level}} ${message}" />
-    -->
-  </targets>
-
-  <rules>
-    <!-- add your logging rules here -->
-
-    <!--
+    <rules>
+        <!-- add your logging rules here -->
+        <!--
     Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
     <logger name="*" minlevel="Debug" writeTo="f" />
     -->
-  </rules>
-</nlog>
+        <logger name="*" minlevel="Debug" maxlevel="Warn" final="true" writeTo="f_base" />
+        <logger name="*" minlevel="Error" writeTo="f_error" />
+    </rules>
+</nlog>
\ No newline at end of file

From 7a734975b9993809d903387c3e00c696705dc26e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 1 Dec 2020 12:13:52 +0100
Subject: [PATCH 2/4] ancora refresh x modifiche await async

---
 IOB-MAN/IOBManPanel.cs | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs
index 2b84f838..9cc7816e 100644
--- a/IOB-MAN/IOBManPanel.cs
+++ b/IOB-MAN/IOBManPanel.cs
@@ -745,7 +745,6 @@ namespace IOB_MAN
         {
             if (!checkRunning)
             {
-                //checkProcessStatusAsync();
                 try
                 {
                     Task result = checkProcessStatusAsync();
@@ -950,21 +949,37 @@ namespace IOB_MAN
         /// <param name="e"></param>
         private void MainTimer_Tick(object sender, EventArgs e)
         {
-            //MainTimer.Stop();
-            if (!checkRunning)
+            var hasLock = false;
+            try
             {
-                //checkProcessStatusAsync();
-                try
+                Monitor.TryEnter(_locker, ref hasLock);
+                if (!hasLock)
                 {
-                    Task result = checkProcessStatusAsync();
-                    result.Wait();
+                    return;
                 }
-                catch (Exception exc)
+                if (!checkRunning)
                 {
-                    Logging.Instance.Error($"MainTimer_Tick {exc}");
+                    try
+                    {
+                        Task result = checkProcessStatusAsync();
+                        result.Wait();
+#if false
+                        await Task.Run(() => checkProcessStatusAsync()).ConfigureAwait(false);
+#endif
+                    }
+                    catch (Exception exc)
+                    {
+                        Logging.Instance.Error($"MainTimer_Tick {exc}");
+                    }
+                }
+            }
+            finally
+            {
+                if (hasLock)
+                {
+                    Monitor.Exit(_locker);
                 }
             }
-            //MainTimer.Start();
         }
 
         /// <summary>
@@ -1148,10 +1163,8 @@ namespace IOB_MAN
 
         private void UI_Timer_Tick(object sender, EventArgs e)
         {
-            //UI_Timer.Stop();
             Task result = updateProgBarAsync();
             result.Wait();
-            //UI_Timer.Start();
         }
 
         private void updateIOBWINToolStripMenuItem_Click(object sender, EventArgs e)

From da7c2e81368d737c5a72bba53501544fcfd9456d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 1 Dec 2020 12:46:15 +0100
Subject: [PATCH 3/4] ancora async/await

---
 IOB-MAN/IOBManPanel.cs | 51 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs
index 9cc7816e..4f6d790f 100644
--- a/IOB-MAN/IOBManPanel.cs
+++ b/IOB-MAN/IOBManPanel.cs
@@ -430,6 +430,7 @@ namespace IOB_MAN
             }
             finally
             {
+                checkRunning = false;
                 if (hasLock)
                 {
                     Monitor.Exit(_locker);
@@ -743,6 +744,7 @@ namespace IOB_MAN
 
         private void forceCheckTimer_Tick(object sender, EventArgs e)
         {
+#if false
             if (!checkRunning)
             {
                 try
@@ -755,6 +757,21 @@ namespace IOB_MAN
                     Logging.Instance.Error($"forceCheckTimer_Tick {exc}");
                 }
             }
+#endif
+
+            if (!checkRunning)
+            {
+                try
+                {
+                    Task result = Task.Run(() => checkProcessStatusAsync().ConfigureAwait(false));
+                    result.Wait();
+                }
+                catch (Exception exc)
+                {
+                    Logging.Instance.Error($"forceCheckTimer_Tick {exc}");
+                }
+            }
+
             checkWatchdog();
             // riavvio i timer x sicurezza...
             UI_Timer.Stop();
@@ -949,35 +966,19 @@ namespace IOB_MAN
         /// <param name="e"></param>
         private void MainTimer_Tick(object sender, EventArgs e)
         {
-            var hasLock = false;
-            try
+            if (!checkRunning)
             {
-                Monitor.TryEnter(_locker, ref hasLock);
-                if (!hasLock)
+                try
                 {
-                    return;
+                    //Task result = checkProcessStatusAsync();
+                    //result.Wait();
+
+                    Task result = Task.Run(() => checkProcessStatusAsync().ConfigureAwait(false));
+                    result.Wait();
                 }
-                if (!checkRunning)
+                catch (Exception exc)
                 {
-                    try
-                    {
-                        Task result = checkProcessStatusAsync();
-                        result.Wait();
-#if false
-                        await Task.Run(() => checkProcessStatusAsync()).ConfigureAwait(false);
-#endif
-                    }
-                    catch (Exception exc)
-                    {
-                        Logging.Instance.Error($"MainTimer_Tick {exc}");
-                    }
-                }
-            }
-            finally
-            {
-                if (hasLock)
-                {
-                    Monitor.Exit(_locker);
+                    Logging.Instance.Error($"MainTimer_Tick {exc}");
                 }
             }
         }

From 4e32e6f40897a1cf6a4aacbcaf526f4d5a880049 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 1 Dec 2020 12:46:24 +0100
Subject: [PATCH 4/4] new rel

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 911831b8..819e8dbc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=754']) {
+        withEnv(['NEXT_BUILD_NUMBER=755']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'