From d7200e2ab70bb02435821a95effbc999d6e87a3c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 14 Nov 2017 11:48:12 +0100 Subject: [PATCH] Aggiunta remote rebootlog + nuova vers... --- IOB-WIN/IobGeneric.cs | 34 ++++++++++++++++++++++++++++++++++ IOB-WIN/MainForm.cs | 13 +++++++++++-- Jenkinsfile | 6 +++--- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index d4e5c836..ecbd33ac 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; +using System.Net.NetworkInformation; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -1008,6 +1009,39 @@ namespace IOB_WIN } } /// + /// URL per segnalazione reboot... + /// + public string urlReboot + { + get + { + string answ = ""; + try + { + answ = string.Format(@"{0}{1}{2}{3}&mac={4}", currIobConf.serverData.MPIP, currIobConf.serverData.MPURL, currIobConf.serverData.CMDREBO, currIobConf.codIOB, GetMACAddress()); + } + catch + { + answ = string.Format(@"{0}{1}{2}{3}", currIobConf.serverData.MPIP, currIobConf.serverData.MPURL, currIobConf.serverData.CMDREBO, currIobConf.codIOB); + } + return answ; + } + } + public string GetMACAddress() + { + NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); + String sMacAddress = string.Empty; + foreach (NetworkInterface adapter in nics) + { + if (sMacAddress == String.Empty)// only return MAC Address from first card + { + IPInterfaceProperties properties = adapter.GetIPProperties(); + sMacAddress = adapter.GetPhysicalAddress().ToString(); + } + } + return sMacAddress; + } + /// /// Fornisce URL INPUT per i parametri richiesti /// /// valore salvato in coda formato dtEve#valore#counter diff --git a/IOB-WIN/MainForm.cs b/IOB-WIN/MainForm.cs index 25576336..636bb3e8 100644 --- a/IOB-WIN/MainForm.cs +++ b/IOB-WIN/MainForm.cs @@ -68,7 +68,7 @@ namespace IOB_WIN /// public tipoAdapter tipoScelto = tipoAdapter.DEMO; /// - /// URLK stringa di UPDATE... + /// URL stringa di UPDATE... /// protected string updateUrl { @@ -558,7 +558,7 @@ namespace IOB_WIN } catch (Exception exc) { - lg.Error(string.Format("EXCEPTIO in fase di lettura OPTPAR: {0}{1}", Environment.NewLine, exc)); + lg.Error(string.Format("EXCEPTION in fase di lettura OPTPAR: {0}{1}", Environment.NewLine, exc)); } } // inizializzio conf IOB @@ -584,6 +584,15 @@ namespace IOB_WIN avviaAdapter(); displayTaskAndLog("Auto Started!"); } + try + { + // segnalo reboot (programma)... + iobObj.callUrl(iobObj.urlReboot); + } + catch (Exception exc) + { + lg.Error(string.Format("EXCEPTION in fase di chaimata URL di reboot:{0}{1}", Environment.NewLine, exc)); + } } /// diff --git a/Jenkinsfile b/Jenkinsfile index 542c9e78..11e4bf06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,9 +14,9 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=163']) { - env.versionNumber = VersionNumber(versionNumberString : '1.14.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - // env.versionNumber = VersionNumber(versionNumberString : '1.14.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + withEnv(['NEXT_BUILD_NUMBER=170']) { + // env.versionNumber = VersionNumber(versionNumberString : '1.14.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '1.14.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN' } }