michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saving events to Events DB : Fixed bugs when connection string was not defined, ver. 2.26.1543

Browse Source
This commit is contained in:
Milan Hanajik 2020-11-18 10:44:30 +01:00
parent 5f5063663c
commit 5f44fd4bdb
6 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs
View File

@ -286,7 +286,7 @@ namespace TBF.BenchControl.Output.DB.ProductionTracing
opCompleted = true;
if (SaveTracingRecords(batch) != Retv.OK) anyError = true;
if (anyError)
if (anyError && !string.IsNullOrEmpty(Events.DB.ConnectionString))
{
try
{
@ -302,17 +302,13 @@ namespace TBF.BenchControl.Output.DB.ProductionTracing
{
log.ErrorFormat("Triggering event(s) failed: {0}", exc.Message);
}
}
return Event.ErrorProcessingResults;
}
else
{
return Event.ResultsWritten;
}
return anyError ? Event.ErrorProcessingResults : Event.ResultsWritten;
}
else
{
if (anyError)
if (anyError && !string.IsNullOrEmpty(Events.DB.ConnectionString))
{
try
{
@ -328,13 +324,9 @@ namespace TBF.BenchControl.Output.DB.ProductionTracing
{
log.ErrorFormat("Triggering event(s) failed: {0}", exc.Message);
}
}
return Event.ErrorProcessingResults;
}
else
{
return Event.ResultsWritten;
}
return anyError ? Event.ErrorProcessingResults : Event.ResultsWritten;
}
}
else

10
TBF/BenchControl/Output/DB/SensusOracle/Database.cs
View File

@ -347,7 +347,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
opCompleted = true;
}
if (anyError)
if (anyError && !string.IsNullOrEmpty(Events.DB.ConnectionString))
{
try
{
@ -363,13 +363,9 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
{
log.ErrorFormat("Triggering event(s) failed: {0}", exc.Message);
}
}
return Event.ErrorProcessingResults;
}
else
{
return Event.ResultsWritten;
}
return anyError ? Event.ErrorProcessingResults : Event.ResultsWritten;
}
else
{

10
TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs
View File

@ -155,7 +155,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
opCompleted = true;
}
if (anyError)
if (anyError && !string.IsNullOrEmpty(Events.DB.ConnectionString))
{
try
{
@ -171,13 +171,9 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
{
log.ErrorFormat("Triggering event(s) failed: {0}", exc.Message);
}
}
return Event.ErrorProcessingResults;
}
else
{
return Event.ResultsWritten;
}
return anyError ? Event.ErrorProcessingResults: Event.ResultsWritten;
}
else
{

2
TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs
View File

@ -170,7 +170,7 @@ namespace TBF.BenchControl.Various.StatisticsMonitoring
}
}
if (doTriggerEvents)
if (doTriggerEvents && !string.IsNullOrEmpty(Events.DB.ConnectionString))
{
///
/// Trigger events

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.26.1542.0")]
[assembly: AssemblyFileVersion("2.26.1542.0")]
[assembly: AssemblyVersion("2.26.1543.0")]
[assembly: AssemblyFileVersion("2.26.1543.0")]

2
TBF/UI/Calendar/CalendarTabPageCtrl.cs
View File

@ -199,7 +199,7 @@ namespace TBF.UI.Calendar
log.ErrorFormat("Failed to load or update CustomEvent-s in ServeTriggerEvtCalendarEvents(): {0}", exc.Message);
}
if (eventsToTrigger.Count > 0)
if (eventsToTrigger.Count > 0 && !string.IsNullOrEmpty(global::Events.DB.ConnectionString))
{
try
{