فهرست منبع

Encoding fix for System Logs. (#4564)

BaronGreenback 4 سال پیش
والد
کامیت
4c291da45c
3فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 1 1
      Emby.Dlna/Service/BaseControlHandler.cs
  2. 1 1
      Jellyfin.Api/Controllers/SystemController.cs
  3. 2 1
      Jellyfin.Server/Program.cs

+ 1 - 1
Emby.Dlna/Service/BaseControlHandler.cs

@@ -49,7 +49,7 @@ namespace Emby.Dlna.Service
         {
         {
             ControlRequestInfo requestInfo = null;
             ControlRequestInfo requestInfo = null;
 
 
-            using (var streamReader = new StreamReader(request.InputXml))
+            using (var streamReader = new StreamReader(request.InputXml, Encoding.UTF8))
             {
             {
                 var readerSettings = new XmlReaderSettings()
                 var readerSettings = new XmlReaderSettings()
                 {
                 {

+ 1 - 1
Jellyfin.Api/Controllers/SystemController.cs

@@ -203,7 +203,7 @@ namespace Jellyfin.Api.Controllers
             // For older files, assume fully static
             // For older files, assume fully static
             var fileShare = file.LastWriteTimeUtc < DateTime.UtcNow.AddHours(-1) ? FileShare.Read : FileShare.ReadWrite;
             var fileShare = file.LastWriteTimeUtc < DateTime.UtcNow.AddHours(-1) ? FileShare.Read : FileShare.ReadWrite;
             FileStream stream = new FileStream(file.FullName, FileMode.Open, FileAccess.Read, fileShare);
             FileStream stream = new FileStream(file.FullName, FileMode.Open, FileAccess.Read, fileShare);
-            return File(stream, "text/plain");
+            return File(stream, "text/plain; charset=utf-8");
         }
         }
 
 
         /// <summary>
         /// <summary>

+ 2 - 1
Jellyfin.Server/Program.cs

@@ -598,7 +598,8 @@ namespace Jellyfin.Server
                     .WriteTo.Async(x => x.File(
                     .WriteTo.Async(x => x.File(
                         Path.Combine(appPaths.LogDirectoryPath, "log_.log"),
                         Path.Combine(appPaths.LogDirectoryPath, "log_.log"),
                         rollingInterval: RollingInterval.Day,
                         rollingInterval: RollingInterval.Day,
-                        outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message}{NewLine}{Exception}"))
+                        outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message}{NewLine}{Exception}",
+                        encoding: Encoding.UTF8))
                     .Enrich.FromLogContext()
                     .Enrich.FromLogContext()
                     .Enrich.WithThreadId()
                     .Enrich.WithThreadId()
                     .CreateLogger();
                     .CreateLogger();