Skip to content

Fix null message regression after quiet logger addition #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richardsondev merged 4 commits into from
Jan 9, 2025
Merged

Fix null message regression after quiet logger addition #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05d10a8
Fix null message regression after quiet logger addition
richardsondev Jan 9, 2025
fe83c82
Update additional overload
richardsondev Jan 9, 2025
6b1f92f
Remove deprecated LogError overloads from ITaskLogger and implementat…
richardsondev Jan 9, 2025
ac9ca70
Trigger reenabled workflows
richardsondev Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Task/AggregateConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ public override bool Execute()
if (!Enum.TryParse(OutputType, true, out FileType outputType) ||
!Enum.IsDefined(typeof(FileType), outputType))
{
logger.LogError("Invalid FileType: {0}. Available options: {1}", OutputType, string.Join(", ", Enum.GetNames(typeof(FileType))));
logger.LogError(message: "Invalid FileType: {0}. Available options: {1}", OutputType, string.Join(", ", Enum.GetNames(typeof(FileType))));
return false;
}

FileType inputType = FileType.Yaml;
if (!string.IsNullOrEmpty(InputType) &&
(!Enum.TryParse(InputType, true, out inputType) || !Enum.IsDefined(typeof(FileType), inputType)))
{
logger.LogError("Invalid FileType: {0}. Available options: {1}", InputType, string.Join(", ", Enum.GetNames(typeof(FileType))));
logger.LogError(message: "Invalid FileType: {0}. Available options: {1}", InputType, string.Join(", ", Enum.GetNames(typeof(FileType))));
return false;
}

Expand All @@ -121,7 +121,7 @@ public override bool Execute()

if (finalResult == null)
{
logger.LogError("No input was found! Check the input directory.");
logger.LogError(message: "No input was found! Check the input directory.");
return false;
}

Expand All @@ -136,7 +136,7 @@ public override bool Execute()
}
catch (Exception ex)
{
logger.LogError("An unknown exception occurred: {0}", ex.Message);
logger.LogError(message: "An unknown exception occurred: {0}", ex.Message);
logger.LogErrorFromException(ex, true, true, null);
return false;
}
Expand Down
25 changes: 0 additions & 25 deletions src/Task/Logger/ITaskLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,6 @@ public interface ITaskLogger
/// <param name="messageArgs">Optional arguments for formatting the message.</param>
void LogError(string message = null, params object[] messageArgs);

/// <summary>
/// Logs an error message with additional parameters.
/// </summary>
/// <param name="subcategory">The subcategory of the error.</param>
/// <param name="errorCode">The error code.</param>
/// <param name="helpKeyword">The help keyword associated with the error.</param>
/// <param name="file">The file in which the error occurred.</param>
/// <param name="lineNumber">The line number where the error occurred.</param>
/// <param name="columnNumber">The column number where the error occurred.</param>
/// <param name="endLineNumber">The end line number of the error.</param>
/// <param name="endColumnNumber">The end column number of the error.</param>
/// <param name="message">The error message to log.</param>
/// <param name="messageArgs">Optional arguments for formatting the message.</param>
void LogError(
string subcategory = null,
string errorCode = null,
string helpKeyword = null,
string file = null,
int lineNumber = 0,
int columnNumber = 0,
int endLineNumber = 0,
int endColumnNumber = 0,
string message = null,
params object[] messageArgs);

/// <summary>
/// Logs an error message from an exception.
/// </summary>
Expand Down
30 changes: 2 additions & 28 deletions src/Task/Logger/QuietTaskLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,9 @@ public QuietTaskLogger(TaskLoggingHelper task)
}

/// <inheritdoc />
public void LogError(string message = null, params object[] messageArgs)
public void LogError(string message, params object[] messageArgs)
{
Log.LogError(message, messageArgs);
}

/// <inheritdoc />
public void LogError(
string subcategory = null,
string errorCode = null,
string helpKeyword = null,
string file = null,
int lineNumber = 0,
int columnNumber = 0,
int endLineNumber = 0,
int endColumnNumber = 0,
string message = null,
params object[] messageArgs)
{
Log.LogError(
subcategory,
errorCode,
helpKeyword,
file,
lineNumber,
columnNumber,
endLineNumber,
endColumnNumber,
message,
messageArgs);
Log.LogError(message ?? "Unknown Error", messageArgs);
}

/// <inheritdoc />
Expand Down
30 changes: 2 additions & 28 deletions src/Task/Logger/TaskLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,9 @@ public TaskLogger(TaskLoggingHelper task)
}

/// <inheritdoc />
public void LogError(string message = null, params object[] messageArgs)
public void LogError(string message, params object[] messageArgs)
{
Log.LogError(message, messageArgs);
}

/// <inheritdoc />
public void LogError(
string subcategory = null,
string errorCode = null,
string helpKeyword = null,
string file = null,
int lineNumber = 0,
int columnNumber = 0,
int endLineNumber = 0,
int endColumnNumber = 0,
string message = null,
params object[] messageArgs)
{
Log.LogError(
subcategory,
errorCode,
helpKeyword,
file,
lineNumber,
columnNumber,
endLineNumber,
endColumnNumber,
message,
messageArgs);
Log.LogError(message ?? "Unknown Error", messageArgs);
}

/// <inheritdoc />
Expand Down
4 changes: 2 additions & 2 deletions src/Task/ObjectManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ await fileGroups.ForEachAsync(Environment.ProcessorCount,
catch (ArgumentException ex)
{
hasError = true;
log.LogError("No reader found for file {0}: {1} Stacktrace: {2}", file, ex.Message, ex.StackTrace);
log.LogError(message: "No reader found for file {0}: {1} Stacktrace: {2}", file, ex.Message, ex.StackTrace);
continue;
}

Expand All @@ -65,7 +65,7 @@ await fileGroups.ForEachAsync(Environment.ProcessorCount,
catch (Exception ex)
{
hasError = true;
log.LogError("Could not parse {0}: {1}", file, ex.Message);
log.LogError(message: "Could not parse {0}: {1}", file, ex.Message);
log.LogErrorFromException(ex, true, true, file);
continue;
}
Expand Down
Loading