From 152da64c65b9b615ff98aac2f98c17c0ac86ef1f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 4 Dec 2019 17:43:39 +0100 Subject: [PATCH] Test fix su scrittura logwatch? --- IOB-WIN/AdapterForm.cs | 19 +++++++++++++++++-- Jenkinsfile | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index 5c7acf22..9a3372e3 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -86,6 +86,15 @@ namespace IOB_WIN #region utils ed helpers + /// + /// Stringa corrente di log... + /// + protected string logWatchString { get; set; } = ""; + /// + /// Veto a NUOVE scritture in logWatch... + /// + protected DateTime logWatchWriteVeto { get; set; } = DateTime.Now; + /// /// Effettua un trim della stringa al numero max di linee da mostrare a video /// @@ -115,8 +124,14 @@ namespace IOB_WIN { try { - lblLogfile.Text = limitLine2show($"{value}{Environment.NewLine}{lblLogfile.Text}"); - lblLogfile.Refresh(); + logWatchString = limitLine2show($"{value}{Environment.NewLine}{logWatchString}"); + DateTime adesso = DateTime.Now; + if (logWatchWriteVeto < adesso) + { + lblLogfile.Text = logWatchString; + lblLogfile.Refresh(); + logWatchWriteVeto = adesso.AddSeconds(1); + } } catch (Exception exc) { diff --git a/Jenkinsfile b/Jenkinsfile index 92b34253..a25b5fc8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=574']) { + withEnv(['NEXT_BUILD_NUMBER=575']) { // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'