From dcbb8d7b18519cc3651afddd26b436da9e29a65f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 18 Apr 2018 16:09:08 +0200 Subject: [PATCH] istanzio NUOVO logger x classe iobFANUC --- IOB-WIN/IobFanuc.cs | 8 +++++++- Jenkinsfile | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index c10787e5..8252fdd8 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -7,6 +7,7 @@ using IOB_UT; using CncLib.CNC; using System.Net.NetworkInformation; using System.Net; +using NLog; namespace IOB_WIN { @@ -108,10 +109,15 @@ 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; - + // inizializzo correttamente aree memoria secondo CONF - iniFileName IniFile fIni = new IniFile(IOBConf.iniFileName); // inizializzo aree di memoria correnti... diff --git a/Jenkinsfile b/Jenkinsfile index 02c706af..ece03f78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=239']) { + withEnv(['NEXT_BUILD_NUMBER=240']) { // 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'