From fc580c7d355d47148a933791a71cc2642ed85500 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 15 Sep 2020 14:38:37 -0700 Subject: [PATCH] Make logging more intuitive --- RombaSharp/Features/Import.cs | 2 +- SabreTools.Library/DatFiles/AttractMode.cs | 2 +- SabreTools.Library/DatFiles/ClrMamePro.cs | 2 +- SabreTools.Library/DatFiles/DatFile.cs | 14 +++++------ SabreTools.Library/DatFiles/DosCenter.cs | 2 +- SabreTools.Library/DatFiles/EverdriveSmdb.cs | 4 ++-- SabreTools.Library/DatFiles/Hashfile.cs | 2 +- SabreTools.Library/DatFiles/Listrom.cs | 2 +- SabreTools.Library/DatFiles/Listxml.cs | 2 +- SabreTools.Library/DatFiles/Logiqx.cs | 2 +- SabreTools.Library/DatFiles/Missfile.cs | 2 +- SabreTools.Library/DatFiles/OfflineList.cs | 2 +- SabreTools.Library/DatFiles/OpenMSX.cs | 2 +- SabreTools.Library/DatFiles/RomCenter.cs | 2 +- SabreTools.Library/DatFiles/SabreJSON.cs | 2 +- SabreTools.Library/DatFiles/SabreXML.cs | 2 +- SabreTools.Library/DatFiles/SeparatedValue.cs | 2 +- SabreTools.Library/DatFiles/SoftwareList.cs | 2 +- SabreTools.Library/FileTypes/Folder.cs | 8 +++---- SabreTools.Library/FileTypes/GZipArchive.cs | 6 ++--- SabreTools.Library/FileTypes/RarArchive.cs | 8 +++---- .../FileTypes/SevenZipArchive.cs | 12 +++++----- SabreTools.Library/FileTypes/TapeArchive.cs | 12 +++++----- SabreTools.Library/FileTypes/XZArchive.cs | 6 ++--- SabreTools.Library/FileTypes/ZipArchive.cs | 12 +++++----- SabreTools.Library/IO/DirectoryExtensions.cs | 10 ++++---- SabreTools.Library/Logging/Logger.cs | 24 +++++++++++++++++++ SabreTools.Library/Skippers/SkipperRule.cs | 2 +- SabreTools/Features/Batch.cs | 2 +- 29 files changed, 88 insertions(+), 64 deletions(-) diff --git a/RombaSharp/Features/Import.cs b/RombaSharp/Features/Import.cs index 49b22a30..d52bef84 100644 --- a/RombaSharp/Features/Import.cs +++ b/RombaSharp/Features/Import.cs @@ -44,7 +44,7 @@ namespace RombaSharp.Features string line = sr.ReadLine(); if (line != "CRC,MD5,SHA-1") // ,Depot { - Globals.Logger.Error("{0} is not a valid export file"); + Globals.Logger.Error($"{input} is not a valid export file"); continue; } diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs index 0582f7d9..131c6fcb 100644 --- a/SabreTools.Library/DatFiles/AttractMode.cs +++ b/SabreTools.Library/DatFiles/AttractMode.cs @@ -169,7 +169,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.Library/DatFiles/ClrMamePro.cs index bcbb295c..985ab3d3 100644 --- a/SabreTools.Library/DatFiles/ClrMamePro.cs +++ b/SabreTools.Library/DatFiles/ClrMamePro.cs @@ -481,7 +481,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index 92fac963..44d419cc 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -750,7 +750,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -816,7 +816,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -890,7 +890,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -939,7 +939,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -2286,7 +2286,7 @@ namespace SabreTools.Library.DatFiles } catch (IOException ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -3526,7 +3526,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error($"Datfile {outfile} could not be written out: {ex}"); + Globals.Logger.Error(ex, $"Datfile {outfile} could not be written out"); if (Globals.ThrowOnError) throw ex; } @@ -3535,7 +3535,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/DatFiles/DosCenter.cs b/SabreTools.Library/DatFiles/DosCenter.cs index def44683..8daff200 100644 --- a/SabreTools.Library/DatFiles/DosCenter.cs +++ b/SabreTools.Library/DatFiles/DosCenter.cs @@ -322,7 +322,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/EverdriveSmdb.cs b/SabreTools.Library/DatFiles/EverdriveSmdb.cs index 36fde7a4..7801dab3 100644 --- a/SabreTools.Library/DatFiles/EverdriveSmdb.cs +++ b/SabreTools.Library/DatFiles/EverdriveSmdb.cs @@ -138,7 +138,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -189,7 +189,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/DatFiles/Hashfile.cs b/SabreTools.Library/DatFiles/Hashfile.cs index 9df45571..6ba5aa4b 100644 --- a/SabreTools.Library/DatFiles/Hashfile.cs +++ b/SabreTools.Library/DatFiles/Hashfile.cs @@ -153,7 +153,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/Listrom.cs b/SabreTools.Library/DatFiles/Listrom.cs index 9d8431ab..3c8c9a4d 100644 --- a/SabreTools.Library/DatFiles/Listrom.cs +++ b/SabreTools.Library/DatFiles/Listrom.cs @@ -314,7 +314,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/Listxml.cs b/SabreTools.Library/DatFiles/Listxml.cs index 3c26dbe1..c5986adb 100644 --- a/SabreTools.Library/DatFiles/Listxml.cs +++ b/SabreTools.Library/DatFiles/Listxml.cs @@ -1201,7 +1201,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs index 8fc97152..b0ab9cec 100644 --- a/SabreTools.Library/DatFiles/Logiqx.cs +++ b/SabreTools.Library/DatFiles/Logiqx.cs @@ -733,7 +733,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/Missfile.cs b/SabreTools.Library/DatFiles/Missfile.cs index e4832893..4501a02b 100644 --- a/SabreTools.Library/DatFiles/Missfile.cs +++ b/SabreTools.Library/DatFiles/Missfile.cs @@ -92,7 +92,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.Library/DatFiles/OfflineList.cs index e7af968e..cc994a9b 100644 --- a/SabreTools.Library/DatFiles/OfflineList.cs +++ b/SabreTools.Library/DatFiles/OfflineList.cs @@ -721,7 +721,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/OpenMSX.cs b/SabreTools.Library/DatFiles/OpenMSX.cs index aee395e1..b66eb367 100644 --- a/SabreTools.Library/DatFiles/OpenMSX.cs +++ b/SabreTools.Library/DatFiles/OpenMSX.cs @@ -583,7 +583,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/RomCenter.cs b/SabreTools.Library/DatFiles/RomCenter.cs index bc2d5fda..586281ba 100644 --- a/SabreTools.Library/DatFiles/RomCenter.cs +++ b/SabreTools.Library/DatFiles/RomCenter.cs @@ -421,7 +421,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/SabreJSON.cs b/SabreTools.Library/DatFiles/SabreJSON.cs index a241c61e..0fdf74db 100644 --- a/SabreTools.Library/DatFiles/SabreJSON.cs +++ b/SabreTools.Library/DatFiles/SabreJSON.cs @@ -407,7 +407,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/SabreXML.cs b/SabreTools.Library/DatFiles/SabreXML.cs index 7ec1a676..52bdf740 100644 --- a/SabreTools.Library/DatFiles/SabreXML.cs +++ b/SabreTools.Library/DatFiles/SabreXML.cs @@ -250,7 +250,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs index 5c51a839..a105184e 100644 --- a/SabreTools.Library/DatFiles/SeparatedValue.cs +++ b/SabreTools.Library/DatFiles/SeparatedValue.cs @@ -159,7 +159,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs index b0146588..be617922 100644 --- a/SabreTools.Library/DatFiles/SoftwareList.cs +++ b/SabreTools.Library/DatFiles/SoftwareList.cs @@ -575,7 +575,7 @@ namespace SabreTools.Library.DatFiles } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (throwOnError) throw ex; return false; } diff --git a/SabreTools.Library/FileTypes/Folder.cs b/SabreTools.Library/FileTypes/Folder.cs index a15dffc5..7755ba73 100644 --- a/SabreTools.Library/FileTypes/Folder.cs +++ b/SabreTools.Library/FileTypes/Folder.cs @@ -126,7 +126,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -207,7 +207,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -249,7 +249,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -389,7 +389,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/FileTypes/GZipArchive.cs b/SabreTools.Library/FileTypes/GZipArchive.cs index 033f368a..156dd5ff 100644 --- a/SabreTools.Library/FileTypes/GZipArchive.cs +++ b/SabreTools.Library/FileTypes/GZipArchive.cs @@ -90,7 +90,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -180,7 +180,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -252,7 +252,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/FileTypes/RarArchive.cs b/SabreTools.Library/FileTypes/RarArchive.cs index 598f9d48..219fa31d 100644 --- a/SabreTools.Library/FileTypes/RarArchive.cs +++ b/SabreTools.Library/FileTypes/RarArchive.cs @@ -83,7 +83,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -166,7 +166,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -229,7 +229,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -273,7 +273,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; } diff --git a/SabreTools.Library/FileTypes/SevenZipArchive.cs b/SabreTools.Library/FileTypes/SevenZipArchive.cs index 2a26ce6a..9537f604 100644 --- a/SabreTools.Library/FileTypes/SevenZipArchive.cs +++ b/SabreTools.Library/FileTypes/SevenZipArchive.cs @@ -132,7 +132,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -250,7 +250,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -340,7 +340,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -396,7 +396,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; } @@ -615,7 +615,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -847,7 +847,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/FileTypes/TapeArchive.cs b/SabreTools.Library/FileTypes/TapeArchive.cs index d77b66ea..f6990909 100644 --- a/SabreTools.Library/FileTypes/TapeArchive.cs +++ b/SabreTools.Library/FileTypes/TapeArchive.cs @@ -89,7 +89,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -172,7 +172,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -235,7 +235,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -279,7 +279,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; } @@ -435,7 +435,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -618,7 +618,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/FileTypes/XZArchive.cs b/SabreTools.Library/FileTypes/XZArchive.cs index 1999ac30..2886b501 100644 --- a/SabreTools.Library/FileTypes/XZArchive.cs +++ b/SabreTools.Library/FileTypes/XZArchive.cs @@ -84,7 +84,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -172,7 +172,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -241,7 +241,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/FileTypes/ZipArchive.cs b/SabreTools.Library/FileTypes/ZipArchive.cs index a04d13fb..3805965c 100644 --- a/SabreTools.Library/FileTypes/ZipArchive.cs +++ b/SabreTools.Library/FileTypes/ZipArchive.cs @@ -133,7 +133,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -251,7 +251,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -345,7 +345,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -401,7 +401,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; } @@ -619,7 +619,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; @@ -852,7 +852,7 @@ namespace SabreTools.Library.FileTypes } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools.Library/IO/DirectoryExtensions.cs b/SabreTools.Library/IO/DirectoryExtensions.cs index 3d71be09..e102d2ce 100644 --- a/SabreTools.Library/IO/DirectoryExtensions.cs +++ b/SabreTools.Library/IO/DirectoryExtensions.cs @@ -91,7 +91,7 @@ namespace SabreTools.Library.IO } catch (Exception ex) { - Globals.Logger.Error($"An exception occurred getting the full path for '{input}': {ex}"); + Globals.Logger.Error(ex, $"An exception occurred getting the full path for '{input}'"); if (Globals.ThrowOnError) throw ex; @@ -115,7 +115,7 @@ namespace SabreTools.Library.IO } catch (Exception ex) { - Globals.Logger.Error($"An exception occurred processing '{dir}': {ex}"); + Globals.Logger.Error(ex, $"An exception occurred processing '{dir}'"); if (Globals.ThrowOnError) throw ex; } @@ -194,7 +194,7 @@ namespace SabreTools.Library.IO } catch (Exception ex) { - Globals.Logger.Error($"An exception occurred getting the full path for '{input}': {ex}"); + Globals.Logger.Error(ex, $"An exception occurred getting the full path for '{input}'"); if (Globals.ThrowOnError) throw ex; @@ -218,7 +218,7 @@ namespace SabreTools.Library.IO } catch (Exception ex) { - Globals.Logger.Error($"An exception occurred processing '{file}': {ex}"); + Globals.Logger.Error(ex, $"An exception occurred processing '{file}'"); if (Globals.ThrowOnError) throw ex; } @@ -238,7 +238,7 @@ namespace SabreTools.Library.IO } catch (Exception ex) { - Globals.Logger.Error($"An exception occurred processing '{input}': {ex}"); + Globals.Logger.Error(ex, $"An exception occurred processing '{input}'"); if (Globals.ThrowOnError) throw ex; } diff --git a/SabreTools.Library/Logging/Logger.cs b/SabreTools.Library/Logging/Logger.cs index 34451143..54bbccd7 100644 --- a/SabreTools.Library/Logging/Logger.cs +++ b/SabreTools.Library/Logging/Logger.cs @@ -247,6 +247,18 @@ namespace SabreTools.Library.Logging return Log(output, LogLevel.USER, appendPrefix); } + /// + /// Write the given exception as a warning to the log output + /// + /// Exception to be written log + /// String to be written log + /// True if the level and datetime should be prepended to each statement (default), false otherwise + /// True if the output could be written, false otherwise + public bool Warning(Exception ex, string output = null, bool appendPrefix = true) + { + return Warning($"{(output != null ? output + ": " : string.Empty)}{ex}", appendPrefix); + } + /// /// Write the given string as a warning to the log output /// @@ -259,6 +271,18 @@ namespace SabreTools.Library.Logging return Log(output, LogLevel.WARNING, appendPrefix); } + /// + /// Writes the given exception as an error in the log + /// + /// Exception to be written log + /// String to be written log + /// True if the level and datetime should be prepended to each statement (default), false otherwise + /// True if the output could be written, false otherwise + public bool Error(Exception ex, string output = null, bool appendPrefix = true) + { + return Error($"{(output != null ? output + ": " : string.Empty)}{ex}", appendPrefix); + } + /// /// Writes the given string as an error in the log /// diff --git a/SabreTools.Library/Skippers/SkipperRule.cs b/SabreTools.Library/Skippers/SkipperRule.cs index 2c82ad62..9717a810 100644 --- a/SabreTools.Library/Skippers/SkipperRule.cs +++ b/SabreTools.Library/Skippers/SkipperRule.cs @@ -201,7 +201,7 @@ namespace SabreTools.Library.Skippers } catch (Exception ex) { - Globals.Logger.Error(ex.ToString()); + Globals.Logger.Error(ex); if (Globals.ThrowOnError) throw ex; diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs index fbb1221c..32dd03c6 100644 --- a/SabreTools/Features/Batch.cs +++ b/SabreTools/Features/Batch.cs @@ -421,7 +421,7 @@ Reset the internal state: reset();"; } catch (Exception ex) { - Globals.Logger.Error($"There was an exception processing {path}: {ex}"); + Globals.Logger.Error(ex, $"There was an exception processing {path}"); continue; } }