Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MTC'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-04 16:56:56 +01:00
parent 2203da8a06 55b528e7e5
commit 151b7da63c
4 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/AdapterForm.cs
+20 -4
View File
@@ -113,8 +113,16 @@ namespace IOB_WIN
}
set
{
lblLogfile.Text = limitLine2show($"{value}{Environment.NewLine}{lblLogfile.Text}");
lblLogfile.Refresh();
try
{
lblLogfile.Text = limitLine2show($"{value}{Environment.NewLine}{lblLogfile.Text}");
lblLogfile.Refresh();
}
catch (Exception exc)
{
string aCapo = Environment.NewLine;
lgError($"Errore in esecuzione logWatcher{aCapo}stringa: {value}{aCapo}{exc}")
}
}
}
/// <summary>
@@ -128,8 +136,16 @@ namespace IOB_WIN
}
set
{
lblTaskLog.Text = limitLine2show($"{value}{Environment.NewLine}{lblTaskLog.Text}");
lblTaskLog.Refresh();
try
{
lblTaskLog.Text = limitLine2show($"{value}{Environment.NewLine}{lblTaskLog.Text}");
lblTaskLog.Refresh();
}
catch (Exception exc)
{
string aCapo = Environment.NewLine;
lgError($"Errore in esecuzione taskWatcher{aCapo}stringa: {value}{aCapo}{exc}")
}
}
}
IOB-WIN/IobGeneric.cs
+17 -8
View File
@@ -722,11 +722,14 @@ namespace IOB_WIN
/// Effettua logging INFO corretto impostanto anche la variabile IOB prima di scrivere...
/// </summary>
/// <param name="message"></param>
protected void lgInfo(string message)
protected void lgInfo(string message, bool sendToForm = true)
{
lg.Factory.Configuration.Variables["codIOB"] = cIobConf.codIOB;
lg.Info(message);
sendToLogWatch("INFO", message);
if (sendToForm)
{
sendToLogWatch("INFO", message);
}
}
/// <summary>
/// Effettua logging INFO corretto impostanto anche la variabile IOB prima di scrivere...
@@ -743,11 +746,14 @@ namespace IOB_WIN
/// Effettua logging ERROR corretto impostanto anche la variabile IOB prima di scrivere...
/// </summary>
/// <param name="message"></param>
protected void lgError(string message)
protected void lgError(string message, bool sendToForm = true)
{
lg.Factory.Configuration.Variables["codIOB"] = cIobConf.codIOB;
lg.Error(message);
sendToLogWatch("ERROR", message);
lg.Error(message);
if (sendToForm)
{
sendToLogWatch("ERROR", message);
}
}
/// <summary>
/// Effettua logging ERROR corretto impostanto anche la variabile IOB prima di scrivere...
@@ -776,11 +782,14 @@ namespace IOB_WIN
/// Effettua logging FATAL corretto impostanto anche la variabile IOB prima di scrivere...
/// </summary>
/// <param name="message"></param>
protected void lgFatal(string message)
protected void lgFatal(string message, bool sendToForm = true)
{
lg.Factory.Configuration.Variables["codIOB"] = cIobConf.codIOB;
lg.Fatal(message);
sendToLogWatch("FATAL", message);
lg.Fatal(message);
if (sendToForm)
{
sendToLogWatch("FATAL", message);
}
}
/// <summary>
/// Effettua logging FATAL corretto impostanto anche la variabile IOB prima di scrivere...
IOB-WIN/IobMTC.cs
+3 -3
View File
@@ -691,7 +691,7 @@ namespace IOB_WIN
}
catch (Exception exc)
{
lgError($"Eccezione in decodifica Conditions x StreamSuccesfull{Environment.NewLine}{exc}");
lgError($"Eccezione in decodifica Conditions x StreamSuccesfull{Environment.NewLine}{exc}", false);
}
// check su events
try
@@ -716,7 +716,7 @@ namespace IOB_WIN
}
catch (Exception exc)
{
lgError($"Eccezione in decodifica Events x StreamSuccesfull{Environment.NewLine}{exc}");
lgError($"Eccezione in decodifica Events x StreamSuccesfull{Environment.NewLine}{exc}", false);
}
// check su samples
@@ -742,7 +742,7 @@ namespace IOB_WIN
{
if (utils.CRB("verbose"))
{
lgInfo($"NON ACCODATO sample poiché verifica variazione SAMPLE ha dato esito negativo");
lgInfo($"NON ACCODATO sample poiché verifica variazione SAMPLE ha dato esito negativo", false);
}
}
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=571']) {
withEnv(['NEXT_BUILD_NUMBER=572']) {
// 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'