diff --git a/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs b/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs index 2829c405c..f0f0a1688 100644 --- a/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs +++ b/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs @@ -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 diff --git a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs index aeb619fe9..1c9722fba 100644 --- a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs +++ b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs @@ -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 { diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs index dc1f15563..9e9fc68f2 100644 --- a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs @@ -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 { diff --git a/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs b/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs index bd0889f31..16874c124 100644 --- a/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs +++ b/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs @@ -170,7 +170,7 @@ namespace TBF.BenchControl.Various.StatisticsMonitoring } } - if (doTriggerEvents) + if (doTriggerEvents && !string.IsNullOrEmpty(Events.DB.ConnectionString)) { /// /// Trigger events diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 9e3071476..ae04342a5 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -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")] diff --git a/TBF/UI/Calendar/CalendarTabPageCtrl.cs b/TBF/UI/Calendar/CalendarTabPageCtrl.cs index 1e14658a3..1bb4e0d4e 100644 --- a/TBF/UI/Calendar/CalendarTabPageCtrl.cs +++ b/TBF/UI/Calendar/CalendarTabPageCtrl.cs @@ -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 {