claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make logging more intuitive

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-15 14:38:37 -07:00
parent f506915a04
commit fc580c7d35
29 changed files with 88 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RombaSharp/Features/Import.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/AttractMode.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/ClrMamePro.cs
View File

@@ -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;
}

14
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -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;

2
SabreTools.Library/DatFiles/DosCenter.cs
View File

@@ -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;
}

4
SabreTools.Library/DatFiles/EverdriveSmdb.cs
View File

@@ -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;

2
SabreTools.Library/DatFiles/Hashfile.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/Listrom.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/Listxml.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/Logiqx.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/Missfile.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/OfflineList.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/OpenMSX.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/RomCenter.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/SabreJSON.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/SabreXML.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/SeparatedValue.cs
View File

@@ -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;
}

2
SabreTools.Library/DatFiles/SoftwareList.cs
View File

@@ -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;
}

8
SabreTools.Library/FileTypes/Folder.cs
View File

@@ -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;

6
SabreTools.Library/FileTypes/GZipArchive.cs
View File

@@ -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;

8
SabreTools.Library/FileTypes/RarArchive.cs
View File

@@ -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;
}

12
SabreTools.Library/FileTypes/SevenZipArchive.cs
View File

@@ -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;

12
SabreTools.Library/FileTypes/TapeArchive.cs
View File

@@ -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;

6
SabreTools.Library/FileTypes/XZArchive.cs
View File

@@ -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;

12
SabreTools.Library/FileTypes/ZipArchive.cs
View File

@@ -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;

10
SabreTools.Library/IO/DirectoryExtensions.cs
View File

@@ -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;
}

24
SabreTools.Library/Logging/Logger.cs
View File

@@ -247,6 +247,18 @@ namespace SabreTools.Library.Logging
return Log(output, LogLevel.USER, appendPrefix);
}
/// <summary>
/// Write the given exception as a warning to the log output
/// </summary>
/// <param name="ex">Exception to be written log</param>
/// <param name="output">String to be written log</param>
/// <param name="appendPrefix">True if the level and datetime should be prepended to each statement (default), false otherwise</param>
/// <returns>True if the output could be written, false otherwise</returns>
public bool Warning(Exception ex, string output = null, bool appendPrefix = true)
{
return Warning($"{(output != null ? output + ": " : string.Empty)}{ex}", appendPrefix);
}
/// <summary>
/// Write the given string as a warning to the log output
/// </summary>
@@ -259,6 +271,18 @@ namespace SabreTools.Library.Logging
return Log(output, LogLevel.WARNING, appendPrefix);
}
/// <summary>
/// Writes the given exception as an error in the log
/// </summary>
/// <param name="ex">Exception to be written log</param>
/// <param name="output">String to be written log</param>
/// <param name="appendPrefix">True if the level and datetime should be prepended to each statement (default), false otherwise</param>
/// <returns>True if the output could be written, false otherwise</returns>
public bool Error(Exception ex, string output = null, bool appendPrefix = true)
{
return Error($"{(output != null ? output + ": " : string.Empty)}{ex}", appendPrefix);
}
/// <summary>
/// Writes the given string as an error in the log
/// </summary>

2
SabreTools.Library/Skippers/SkipperRule.cs
View File

@@ -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;

2
SabreTools/Features/Batch.cs
View File

@@ -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;
}
}