michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Log when falling back on NullImageEncoder

Browse Source
This commit is contained in:
Bond_009 2019-01-02 00:10:26 +01:00 committed by Vasily
parent 76d6b1fc2a
commit 5d855ee84c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Jellyfin.Server/Program.cs
View File

@ -81,7 +81,7 @@ namespace Jellyfin.Server
{ {
appHost.Init(); appHost.Init();
appHost.ImageProcessor.ImageEncoder = GetImageEncoder(_logger, fileSystem, options, () => appHost.HttpClient, appPaths, environmentInfo, appHost.LocalizationManager); appHost.ImageProcessor.ImageEncoder = getImageEncoder(_logger, fileSystem, options, () => appHost.HttpClient, appPaths, environmentInfo, appHost.LocalizationManager);
_logger.LogInformation("Running startup tasks"); _logger.LogInformation("Running startup tasks");
@ -184,7 +184,7 @@ namespace Jellyfin.Server
} }
} }
public static IImageEncoder GetImageEncoder( public static IImageEncoder getImageEncoder(
ILogger logger, ILogger logger,
IFileSystem fileSystem, IFileSystem fileSystem,
StartupOptions startupOptions, StartupOptions startupOptions,
@ -201,17 +201,18 @@ namespace Jellyfin.Server
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.LogInformation("Skia not available. Will try next image processor. {0}", ex.Message); logger.LogInformation(ex, "Skia not available. Will try next image processor. {0}");
} }
try try
{ {
return new ImageMagickEncoder(logger, appPaths, httpClient, fileSystem, environment); return new ImageMagickEncoder(logger, appPaths, httpClient, fileSystem, environment);
} }
catch catch (Exception ex)
{ {
logger.LogInformation("ImageMagick not available. Will try next image processor."); logger.LogInformation(ex, "ImageMagick not available. Will try next image processor.");
} }
_logger.LogInformation("Falling back on NullImageEncoder");
} }
return new NullImageEncoder(); return new NullImageEncoder();