mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-12-30 04:34:49 +03:00
Rework startup topic handling and reenable output to logging framework (#14243)
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using System;
|
||||
using Morestachio.Helper.Logging;
|
||||
using ILogger = Microsoft.Extensions.Logging.ILogger;
|
||||
|
||||
namespace Jellyfin.Server.ServerSetupApp;
|
||||
@@ -9,6 +8,11 @@ namespace Jellyfin.Server.ServerSetupApp;
|
||||
/// </summary>
|
||||
public interface IStartupLogger : ILogger
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets the topic this logger is assigned to.
|
||||
/// </summary>
|
||||
StartupLogTopic? Topic { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Adds another logger instance to this logger for combined logging.
|
||||
/// </summary>
|
||||
@@ -22,4 +26,41 @@ public interface IStartupLogger : ILogger
|
||||
/// <param name="logEntry">Defines the log message that introduces the new group.</param>
|
||||
/// <returns>A new logger that can write to the group.</returns>
|
||||
IStartupLogger BeginGroup(FormattableString logEntry);
|
||||
|
||||
/// <summary>
|
||||
/// Adds another logger instance to this logger for combined logging.
|
||||
/// </summary>
|
||||
/// <param name="logger">Other logger to rely messages to.</param>
|
||||
/// <returns>A combined logger.</returns>
|
||||
/// <typeparam name="TCategory">The logger cateogry.</typeparam>
|
||||
IStartupLogger<TCategory> With<TCategory>(ILogger logger);
|
||||
|
||||
/// <summary>
|
||||
/// Opens a new Group logger within the parent logger.
|
||||
/// </summary>
|
||||
/// <param name="logEntry">Defines the log message that introduces the new group.</param>
|
||||
/// <returns>A new logger that can write to the group.</returns>
|
||||
/// <typeparam name="TCategory">The logger cateogry.</typeparam>
|
||||
IStartupLogger<TCategory> BeginGroup<TCategory>(FormattableString logEntry);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Defines a logger that can be injected via DI to get a startup logger initialised with an logger framework connected <see cref="ILogger"/>.
|
||||
/// </summary>
|
||||
/// <typeparam name="TCategory">The logger cateogry.</typeparam>
|
||||
public interface IStartupLogger<TCategory> : IStartupLogger
|
||||
{
|
||||
/// <summary>
|
||||
/// Adds another logger instance to this logger for combined logging.
|
||||
/// </summary>
|
||||
/// <param name="logger">Other logger to rely messages to.</param>
|
||||
/// <returns>A combined logger.</returns>
|
||||
new IStartupLogger<TCategory> With(ILogger logger);
|
||||
|
||||
/// <summary>
|
||||
/// Opens a new Group logger within the parent logger.
|
||||
/// </summary>
|
||||
/// <param name="logEntry">Defines the log message that introduces the new group.</param>
|
||||
/// <returns>A new logger that can write to the group.</returns>
|
||||
new IStartupLogger<TCategory> BeginGroup(FormattableString logEntry);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user