Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Encoding fix for System Logs. (#4564)

Browse Source
This commit is contained in:
BaronGreenback 2020-12-30 17:31:26 +00:00 committed by GitHub
parent 054adf6379
commit 4c291da45c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Dlna/Service/BaseControlHandler.cs
View File

@ -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()
{ {

2
Jellyfin.Api/Controllers/SystemController.cs
View File

@ -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>

3
Jellyfin.Server/Program.cs
View File

@ -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();