Merge branch 'MTC'
This commit is contained in:
+17
-2
@@ -86,6 +86,15 @@ namespace IOB_WIN
|
||||
|
||||
#region utils ed helpers
|
||||
|
||||
/// <summary>
|
||||
/// Stringa corrente di log...
|
||||
/// </summary>
|
||||
protected string logWatchString { get; set; } = "";
|
||||
/// <summary>
|
||||
/// Veto a NUOVE scritture in logWatch...
|
||||
/// </summary>
|
||||
protected DateTime logWatchWriteVeto { get; set; } = DateTime.Now;
|
||||
|
||||
/// <summary>
|
||||
/// Effettua un trim della stringa al numero max di linee da mostrare a video
|
||||
/// </summary>
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Vendored
+1
-1
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user