ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-18 13:57:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/master' into net8-rollup

Browse source
This commit is contained in:
github-actions[bot] 2024-02-11 18:20:47 +00:00
commit 5fbba87e59
73 changed files with 9530 additions and 1736 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Dalamud/Logging/Internal/ModuleLog.cs
View file

@ -33,7 +33,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Verbose(string messageTemplate, params object[] values)
public void Verbose(string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Verbose, messageTemplate, null, values);
/// <summary>
@ -43,7 +43,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Verbose(Exception exception, string messageTemplate, params object[] values)
public void Verbose(Exception? exception, string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Verbose, messageTemplate, exception, values);
/// <summary>
@ -52,7 +52,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Debug(string messageTemplate, params object[] values)
public void Debug(string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Debug, messageTemplate, null, values);
/// <summary>
@ -62,7 +62,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Debug(Exception exception, string messageTemplate, params object[] values)
public void Debug(Exception? exception, string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Debug, messageTemplate, exception, values);
/// <summary>
@ -71,7 +71,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Information(string messageTemplate, params object[] values)
public void Information(string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Information, messageTemplate, null, values);
/// <summary>
@ -81,7 +81,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Information(Exception exception, string messageTemplate, params object[] values)
public void Information(Exception? exception, string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Information, messageTemplate, exception, values);
/// <summary>
@ -90,7 +90,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Warning(string messageTemplate, params object[] values)
public void Warning(string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Warning, messageTemplate, null, values);
/// <summary>
@ -100,7 +100,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Warning(Exception exception, string messageTemplate, params object[] values)
public void Warning(Exception? exception, string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Warning, messageTemplate, exception, values);
/// <summary>
@ -109,7 +109,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Error(string messageTemplate, params object[] values)
public void Error(string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Error, messageTemplate, null, values);
/// <summary>
@ -119,7 +119,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Error(Exception? exception, string messageTemplate, params object[] values)
public void Error(Exception? exception, string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Error, messageTemplate, exception, values);
/// <summary>
@ -128,7 +128,7 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Fatal(string messageTemplate, params object[] values)
public void Fatal(string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Fatal, messageTemplate, null, values);
/// <summary>
@ -138,12 +138,12 @@ public class ModuleLog
/// <param name="messageTemplate">The message template.</param>
/// <param name="values">Values to log.</param>
[MessageTemplateFormatMethod("messageTemplate")]
public void Fatal(Exception exception, string messageTemplate, params object[] values)
public void Fatal(Exception? exception, string messageTemplate, params object?[] values)
=> this.WriteLog(LogEventLevel.Fatal, messageTemplate, exception, values);
[MessageTemplateFormatMethod("messageTemplate")]
private void WriteLog(
LogEventLevel level, string messageTemplate, Exception? exception = null, params object[] values)
LogEventLevel level, string messageTemplate, Exception? exception = null, params object?[] values)
{
// FIXME: Eventually, the `pluginName` tag should be removed from here and moved over to the actual log
// formatter.

3
Dalamud/Logging/PluginLog.cs
View file

@ -1,6 +1,8 @@
using System.Reflection;
using Dalamud.Plugin.Services;
using Dalamud.Utility;
using Serilog;
using Serilog.Events;
@ -14,6 +16,7 @@ namespace Dalamud.Logging;
/// move over as soon as reasonably possible for performance reasons.
/// </remarks>
[Obsolete("Static PluginLog will be removed in API 10. Developers should use IPluginLog.")]
[Api10ToDo(Api10ToDoAttribute.DeleteCompatBehavior)]
public static class PluginLog
{
#region "Log" prefixed Serilog style methods