From 2a68934b0e9288bcf7e342588c95d5530e389051 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 7 Sep 2018 12:40:32 +0200 Subject: [PATCH] More logging in all Output.FileWriters, ver. 2.18.992 --- TBF/BenchControl/Output/FileWriters/Basic/Writer.cs | 2 ++ .../Output/FileWriters/Enhanced/Writer.cs | 12 ++++++++---- .../Output/FileWriters/IperlLogger/Writer.cs | 10 +++++++++- .../Output/FileWriters/OneFilePerMeter/Writer.cs | 12 ++++++++---- TBF/BenchControl/Output/FileWriters/Xml/Writer.cs | 10 ++++++++-- .../Output/FileWriters/XmlBatch/Writer.cs | 10 ++++++++-- 6 files changed, 43 insertions(+), 13 deletions(-) diff --git a/TBF/BenchControl/Output/FileWriters/Basic/Writer.cs b/TBF/BenchControl/Output/FileWriters/Basic/Writer.cs index b8000d36e..3de6d0904 100644 --- a/TBF/BenchControl/Output/FileWriters/Basic/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/Basic/Writer.cs @@ -253,9 +253,11 @@ namespace TBF.BenchControl.Output.FileWriters.Basic { writer = File.AppendText(GetFilename(destination, batch.EndTime)); WriteRsltsEx(batch, writer); + log.WarnFormat("Batch {0} written by {1} to file {2}", batch.BatchNr, Name, destination); } catch { + log.ErrorFormat("Error writing batch {0} by {1} to file {2}", batch.BatchNr, Name, destination); } finally { diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs index 08f1b27f2..aa8a1c288 100644 --- a/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs @@ -242,20 +242,24 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced { if (batch == null || batch.WaterMeters == null || batch.WaterMeters.Count <= 0) return; - StreamWriter writer = StreamWriter.Null; if (!string.IsNullOrEmpty(destination)) { + StreamWriter writer = StreamWriter.Null; try { writer = File.AppendText(GetFilename(destination, batch.EndTime)); + WriteRsltsEx(batch, writer); + log.WarnFormat("Batch {0} written by {1} to file {2}", batch.BatchNr, Name, destination); } catch { + log.ErrorFormat("Error writing batch {0} by {1} to file {2}", batch.BatchNr, Name, destination); + } + finally + { + writer.Close(); } } - - WriteRsltsEx(batch, writer); - writer.Close(); } diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs index f645a1270..2990ab9ce 100644 --- a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs @@ -173,7 +173,15 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger if (!opCompleted) { if (batch.WaterMeters.Count == 0) return Event.ResultsWritten; - WriteLogsToDisk(logger, batch); + try + { + WriteLogsToDisk(logger, batch); + log.WarnFormat("Batch {0} written by {1}", batch.BatchNr, Name); + } + catch (Exception) + { + log.ErrorFormat("Error writing batch {0} by {1}", batch.BatchNr, Name); + } opCompleted = true; } diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs index 9de42600b..9dcc1066f 100644 --- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs @@ -241,20 +241,24 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter void WriteRslts(Results.Entities.Batch batch, string destination) { - StreamWriter writer = StreamWriter.Null; if (!string.IsNullOrEmpty(destination)) { + StreamWriter writer = StreamWriter.Null; try { writer = File.AppendText(GetFilename(destination, batch.EndTime)); + WriteRsltsEx(batch, writer); + log.WarnFormat("Batch {0} written by {1} to file {2}", batch.BatchNr, Name, destination); } catch { + log.ErrorFormat("Error writing batch {0} by {1} to file {2}", batch.BatchNr, Name, destination); + } + finally + { + writer.Close(); } } - - WriteRsltsEx(batch, writer); - writer.Close(); } diff --git a/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs b/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs index e1c0e3632..5bc71c3be 100644 --- a/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs @@ -222,14 +222,20 @@ namespace TBF.BenchControl.Output.FileWriters.Xml foreach (var wm in batch.WaterMeters) { + StreamWriter writer = StreamWriter.Null; try { - StreamWriter writer = File.AppendText(GetFilename(destination, batch.EndTime, wm.WMPosition)); + writer = File.AppendText(GetFilename(destination, batch.EndTime, wm.WMPosition)); WriteWM(writer, wm); - writer.Close(); + log.WarnFormat("Batch {0}/watermeter {1} written by {2} to file {3}", batch.BatchNr, wm.WMPosition, Name, destination); } catch { + log.ErrorFormat("Error writing batch {0}/watermeter {1} by {2} to file {3}", batch.BatchNr, wm.WMPosition, Name, destination); + } + finally + { + writer.Close(); } } } diff --git a/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs b/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs index 3e0bb1eff..2140b4898 100644 --- a/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs @@ -227,14 +227,20 @@ namespace TBF.BenchControl.Output.FileWriters.XmlBatch if (string.IsNullOrEmpty(destination)) return; if (batch.WaterMeters == null || batch.WaterMeters.Count == 0) return; + StreamWriter writer = StreamWriter.Null; try { - StreamWriter writer = File.AppendText(GetFilename(destination, batch.EndTime)); + writer = File.AppendText(GetFilename(destination, batch.EndTime)); WriteBatch(writer); - writer.Close(); + log.WarnFormat("Batch {0} written by {1} to file {2}", batch.BatchNr, Name, destination); } catch { + log.ErrorFormat("Error writing batch {0} by {1} to file {2}", batch.BatchNr, Name, destination); + } + finally + { + writer.Close(); } }