From 6b20b8fcd289b907514a9c8542f9d274f9158ea9 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 18 Apr 2018 18:54:35 +0200
Subject: [PATCH] Appunti x nuovo logger (NON ANCORA OK)

---
 IOB-WIN/DATA/CONF/2999.ini | 52 ++++++++++++++++++++++++++++++++++++++
 IOB-WIN/DATA/CONF/MAIN.ini |  2 +-
 IOB-WIN/IOB-WIN.csproj     |  4 +++
 IOB-WIN/IobFanuc.cs        | 11 +-------
 IOB-WIN/IobGeneric.cs      |  2 +-
 IOB-WIN/NLog.config        |  3 ++-
 Jenkinsfile                |  2 +-
 7 files changed, 62 insertions(+), 14 deletions(-)
 create mode 100644 IOB-WIN/DATA/CONF/2999.ini

diff --git a/IOB-WIN/DATA/CONF/2999.ini b/IOB-WIN/DATA/CONF/2999.ini
new file mode 100644
index 00000000..dd367423
--- /dev/null
+++ b/IOB-WIN/DATA/CONF/2999.ini
@@ -0,0 +1,52 @@
+;Configurazione IOB-WIN
+[IOB]
+CNCTYPE=DEMO
+
+[MACHINE]
+VENDOR=STEAMWARE
+MODEL=DEMO
+
+[CNC]
+; TEST TORNOS!
+IP=127.0.0.1
+PORT=8193
+
+[SERVER]
+MPIP=http://10.74.82.219
+MPURL=/MP/IO
+CMDBASE=/IOB/input/
+CMDFLOG=/IOB/flog/
+CMDALIVE=/IOB
+CMDENABLED=/IOB/enabled/
+CMDADV1=?valore=
+CMDREBO=/sendReboot.aspx?idxMacchina=
+
+[MEMORY]
+BITRED=Y8.4
+BITYELLOW=Y8.5
+BITGREEN=Y8.6
+
+[BLINK]
+;MAX_COUNTER_BLINK = 30
+MAX_COUNTER_BLINK = 15
+;bit0 = 0
+;bit1 = 0
+;bit2 = 1
+;bit3 = 1
+;bit4 = 1
+;bit5 = 0
+;bit6 = 0
+;bit7 = 0
+BLINK_FILT=0
+;BLINK_FILT=28
+
+[OPTPAR]
+;PZCOUNT_MODE=STD|BIT
+PZCOUNT_MODE=BIT
+PZ_CAD_MADDR=1602
+PZ_REQ_MADDR=1603
+PZ_DONE_MADDR=1604
+PZ_GTOT_MADDR=1605
+
+[BRANCH]
+NAME=develop
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini
index 6e3c81cf..aa7053da 100644
--- a/IOB-WIN/DATA/CONF/MAIN.ini
+++ b/IOB-WIN/DATA/CONF/MAIN.ini
@@ -11,6 +11,6 @@ CMDREBO=/IOB/sendRebootGateway?GWIP=
 CMDIOB2CALL=/IOB/getIob2call?GWIP=
 
 [IOB]
-STARTLIST=3000
+STARTLIST=3000,2999
 MAXCNC=4
 ;STARTLIST=3001,3002,3003,3004,3005
\ No newline at end of file
diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index a1b122a8..47321505 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -158,12 +158,16 @@
       <DependentUpon>App.config</DependentUpon>
       <IsTransformFile>True</IsTransformFile>
     </None>
+    <None Include="DATA\CONF\2999.ini">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="DATA\CONF\3000.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="DATA\CONF\3006.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="DATA\CONF\3007.ini" />
     <None Include="DATA\CONF\3010.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index b56e6ba2..8c1153d2 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -13,10 +13,6 @@ namespace IOB_WIN
 {
   public class IobFanuc : IobGeneric
   {
-    /// <summary>
-    /// wrapper di log con NEW = istanze separate...
-    /// </summary>
-    public new Logger lg;
     /// <summary>
     /// Contapezzi attuale
     /// </summary>
@@ -112,12 +108,7 @@ namespace IOB_WIN
     {
       // i dati RAW principali sono 6 byte...
       RawInput = new byte[6];
-
-      // rendo log UNICO 
-      lg = LogManager.GetCurrentClassLogger();
-      // aggiungo nel logger IDX Macchina
-      LogManager.Configuration.Variables["codIOB"] = IOBConf.codIOB;
-
+      
       // gestione invio ritardato contapezzi
       pzCountDelay = utils.CRI("pzCountDelay");
       lastPzCountSend = DateTime.Now;
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index 200969f4..c582647c 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -45,7 +45,7 @@ namespace IOB_WIN
     /// <summary>
     /// wrapper di log
     /// </summary>
-    public Logger lg;
+    protected static Logger lg;
     /// <summary>
     /// ULtimo valore inviato (in caso di disconnessione lo reinvia x garantire watchdog...)
     /// </summary>
diff --git a/IOB-WIN/NLog.config b/IOB-WIN/NLog.config
index 51a50eb9..53f4df59 100644
--- a/IOB-WIN/NLog.config
+++ b/IOB-WIN/NLog.config
@@ -27,11 +27,12 @@
             layout="${longdate} ${uppercase:${level}} ${message}" />
             layout="${longdate} ${uppercase:${level}} ${logger:shortName=true} ${message}"
             layout="${longdate} ${uppercase:${level}} ${callsite} ${message}"
+            layout="${longdate} ${var:codIOB:default=0000}|${uppercase:${level}}|${callsite:shortName=true}|${threadid}|${message}|${exception:format=tostring}"
     -->
     <target xsi:type="File"
         name="f"
         fileName="${basedir}/logs/${shortdate}.log"
-        layout="${longdate} ${var:codIOB:default=0000} ${uppercase:${level}} ${callsite:shortName=true} ${message}"
+        layout="${longdate}|${uppercase:${level}}|${var:codIOB:default=0000}|${callsite:shortName=true}|${threadid}|${message}|${exception:format=tostring}"
         archiveFileName="${basedir}/logs/${shortdate}.{###}.zip"
         archiveNumbering="Sequence"
         archiveEvery="Day"
diff --git a/Jenkinsfile b/Jenkinsfile
index 5b694c8f..05aa401a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=241']) {
+        withEnv(['NEXT_BUILD_NUMBER=242']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'