aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Mono/ImageEncoderHelper.cs
diff options
context:
space:
mode:
authorLogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>2019-01-01 11:47:57 -0800
committerGitHub <noreply@github.com>2019-01-01 11:47:57 -0800
commit443218e3f109cdfbffa8c8c5d30e09e3ba5c2285 (patch)
tree6de8dee799eebba514bac0b6eac457b4c0137978 /MediaBrowser.Server.Mono/ImageEncoderHelper.cs
parent0c52f448a0c6d5cd3c5cce597fcf3ad9582c90f1 (diff)
parentcff0ece07329bbfa05fd22fbde444d09aaeb9a5c (diff)
Merge pull request #4 from jellyfin/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Mono/ImageEncoderHelper.cs')
-rw-r--r--MediaBrowser.Server.Mono/ImageEncoderHelper.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs
index 49955ad65..29760ec55 100644
--- a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs
+++ b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs
@@ -6,7 +6,7 @@ using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
using Emby.Drawing.Skia;
using MediaBrowser.Model.System;
using MediaBrowser.Model.Globalization;
@@ -16,7 +16,6 @@ namespace MediaBrowser.Server.Startup.Common
public class ImageEncoderHelper
{
public static IImageEncoder GetImageEncoder(ILogger logger,
- ILogManager logManager,
IFileSystem fileSystem,
StartupOptions startupOptions,
Func<IHttpClient> httpClient,
@@ -28,20 +27,20 @@ namespace MediaBrowser.Server.Startup.Common
{
try
{
- return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem, localizationManager);
+ return new SkiaEncoder(logger, appPaths, httpClient, fileSystem, localizationManager);
}
catch (Exception ex)
{
- logger.Info("Skia not available. Will try next image processor. {0}", ex.Message);
+ logger.LogInformation("Skia not available. Will try next image processor. {0}", ex.Message);
}
try
{
- return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem, environment);
+ return new ImageMagickEncoder(logger, appPaths, httpClient, fileSystem, environment);
}
catch
{
- logger.Info("ImageMagick not available. Will try next image processor.");
+ logger.LogInformation("ImageMagick not available. Will try next image processor.");
}
}