mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 20:24:27 -04:00
* Fixed a bug on bookmark mode not finding correct image for prefetcher. * Fixed up the edit series relationship modal on tablet viewports. * On double page mode, only bookmark 1 page if only 1 pages is renderered on screen. * Added percentage read of a given library and average hours read per week to user stats. * Fixed a bug in the reader with paging in bookmark mode * Added a "This Week" option to top readers history * Added date ranges for reading time. Added dates that don't have anything, but might remove. * On phone, when applying a metadata filter, when clicking apply, collapse the filter automatically. * Disable jump bar and the resuming from last spot when a custom sort is applied. * Ensure all Regex.Replace or Matches have timeouts set * Fixed a long standing bug where fit to height on tablets wouldn't center the image * Streamlined url parsing to be more reliable * Reduced an additional db query in chapter info. * Added a missing task to convert covers to webP and added messaging to help the user understand to run it after modifying the setting. * Changed OPDS to be enabled by default for new installs. This should reduce issues with users being confused about it before it's enabled. * When there are multiple files for a chapter, show a count card on the series detail to help user understand duplicates exist. Made the unread badge smaller to avoid collision. * Added Word Count to user stats and wired up average reading per week. * Fixed word count failing on some epubs * Removed some debug code * Don't give more information than is necessary about file paths for page dimensions. * Fixed a bug where pagination area would be too small when the book's content was less that height on default mode. * Updated Default layout mode to Scroll for books. * Added bytes in the UI and at an API layer for CDisplayEx * Don't log health checks to logs at all. * Changed Word Count to Length to match the way pages work * Made reading time more clear when min hours is 0 * Apply more aggressive coalescing when remapping bad metadata keys for epubs. * Changed the amount of padding between icon and text for side nav item. * Fixed a NPE on book reader (harmless) * Fixed an ordering issue where Volume 1 was a single file but also tagged as Chapter 1 and Volume 2 was Chapter 0. Thus Volume 2 was being selected for continue point when Volume 1 should have been. * When clicking on an activity stream header from dashboard, show the title on the resulting page. * Removed a property that can't be animated * Fixed a typeahead typescript issue * Added Size into Series Info and Added some tooltip and spacing changes to better explain some fields. * Added size for volume drawers and cleaned up some date edge case handling * Fixed an annoying bug where when on mobile opening a view with a metadata filter, Kavita would open the filter automatically.
115 lines
5.3 KiB
C#
115 lines
5.3 KiB
C#
using System;
|
|
using System.IO;
|
|
using System.Net;
|
|
using API.Services;
|
|
using Microsoft.AspNetCore.Hosting;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Serilog;
|
|
using Serilog.Core;
|
|
using Serilog.Events;
|
|
using Serilog.Formatting.Display;
|
|
|
|
namespace API.Logging;
|
|
|
|
/// <summary>
|
|
/// This class represents information for configuring Logging in the Application. Only a high log level is exposed and Kavita
|
|
/// controls the underlying log levels for different loggers in ASP.NET
|
|
/// </summary>
|
|
public static class LogLevelOptions
|
|
{
|
|
public const string LogFile = "config/logs/kavita.log";
|
|
public const bool LogRollingEnabled = true;
|
|
/// <summary>
|
|
/// Controls the Logging Level of the Application
|
|
/// </summary>
|
|
private static readonly LoggingLevelSwitch LogLevelSwitch = new ();
|
|
/// <summary>
|
|
/// Controls Microsoft's Logging Level
|
|
/// </summary>
|
|
private static readonly LoggingLevelSwitch MicrosoftLogLevelSwitch = new (LogEventLevel.Error);
|
|
/// <summary>
|
|
/// Controls Microsoft.Hosting.Lifetime's Logging Level
|
|
/// </summary>
|
|
private static readonly LoggingLevelSwitch MicrosoftHostingLifetimeLogLevelSwitch = new (LogEventLevel.Error);
|
|
/// <summary>
|
|
/// Controls Hangfire's Logging Level
|
|
/// </summary>
|
|
private static readonly LoggingLevelSwitch HangfireLogLevelSwitch = new (LogEventLevel.Error);
|
|
/// <summary>
|
|
/// Controls Microsoft.AspNetCore.Hosting.Internal.WebHost's Logging Level
|
|
/// </summary>
|
|
private static readonly LoggingLevelSwitch AspNetCoreLogLevelSwitch = new (LogEventLevel.Error);
|
|
|
|
public static LoggerConfiguration CreateConfig(LoggerConfiguration configuration)
|
|
{
|
|
const string outputTemplate = "[Kavita] [{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} {CorrelationId} {ThreadId}] [{Level}] {SourceContext} {Message:lj}{NewLine}{Exception}";
|
|
return configuration
|
|
.MinimumLevel
|
|
.ControlledBy(LogLevelSwitch)
|
|
.MinimumLevel.Override("Microsoft", MicrosoftLogLevelSwitch)
|
|
.MinimumLevel.Override("Microsoft.Hosting.Lifetime", MicrosoftHostingLifetimeLogLevelSwitch)
|
|
.MinimumLevel.Override("Hangfire", HangfireLogLevelSwitch)
|
|
.MinimumLevel.Override("Microsoft.AspNetCore.Hosting.Internal.WebHost", AspNetCoreLogLevelSwitch)
|
|
// Suppress noisy loggers that add no value
|
|
.MinimumLevel.Override("Microsoft.AspNetCore.ResponseCaching.ResponseCachingMiddleware", LogEventLevel.Error)
|
|
.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Error)
|
|
.Enrich.FromLogContext()
|
|
.Enrich.WithThreadId()
|
|
.WriteTo.Console(new MessageTemplateTextFormatter(outputTemplate))
|
|
.WriteTo.File(LogFile,
|
|
shared: true,
|
|
rollingInterval: RollingInterval.Day,
|
|
outputTemplate: outputTemplate)
|
|
.Filter.ByIncludingOnly(ShouldIncludeLogStatement);
|
|
}
|
|
|
|
private static bool ShouldIncludeLogStatement(LogEvent e)
|
|
{
|
|
if (e.Properties.ContainsKey("SourceContext") &&
|
|
e.Properties["SourceContext"].ToString().Replace("\"", string.Empty) == "Serilog.AspNetCore.RequestLoggingMiddleware")
|
|
{
|
|
if (e.Properties.ContainsKey("Path") && e.Properties["Path"].ToString().Replace("\"", string.Empty) == "/api/health") return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public static void SwitchLogLevel(string level)
|
|
{
|
|
switch (level)
|
|
{
|
|
case "Debug":
|
|
LogLevelSwitch.MinimumLevel = LogEventLevel.Debug;
|
|
MicrosoftLogLevelSwitch.MinimumLevel = LogEventLevel.Warning; // This is DB output information, Inf shows the SQL
|
|
MicrosoftHostingLifetimeLogLevelSwitch.MinimumLevel = LogEventLevel.Information;
|
|
AspNetCoreLogLevelSwitch.MinimumLevel = LogEventLevel.Warning;
|
|
break;
|
|
case "Information":
|
|
LogLevelSwitch.MinimumLevel = LogEventLevel.Information;
|
|
MicrosoftLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
MicrosoftHostingLifetimeLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
AspNetCoreLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
break;
|
|
case "Trace":
|
|
LogLevelSwitch.MinimumLevel = LogEventLevel.Verbose;
|
|
MicrosoftLogLevelSwitch.MinimumLevel = LogEventLevel.Information;
|
|
MicrosoftHostingLifetimeLogLevelSwitch.MinimumLevel = LogEventLevel.Debug;
|
|
AspNetCoreLogLevelSwitch.MinimumLevel = LogEventLevel.Information;
|
|
break;
|
|
case "Warning":
|
|
LogLevelSwitch.MinimumLevel = LogEventLevel.Warning;
|
|
MicrosoftLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
MicrosoftHostingLifetimeLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
AspNetCoreLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
break;
|
|
case "Critical":
|
|
LogLevelSwitch.MinimumLevel = LogEventLevel.Fatal;
|
|
MicrosoftLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
MicrosoftHostingLifetimeLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
AspNetCoreLogLevelSwitch.MinimumLevel = LogEventLevel.Error;
|
|
break;
|
|
}
|
|
}
|
|
|
|
}
|