Merge pull request #4 from jellyfin/dev

Dev

2 files changed, 4 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 3d2871e65..c8c2367e6 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -8,10 +8,10 @@ using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Session;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.MediaEncoding
 {
@@ -727,7 +727,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             return count;
         }
-
         protected void DisposeIsoMount()
         {
             if (IsoMount != null)
@@ -738,7 +737,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error disposing iso mount", ex);
+                    _logger.LogError(ex, "Error disposing iso mount");
                 }
 
                 IsoMount = null;
diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
index 5f3f79d77..8bb826bd1 100644
--- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
+++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
@@ -1,10 +1,10 @@
 using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.Logging;
 using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.MediaEncoding
 {
@@ -43,7 +43,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error reading ffmpeg log", ex);
+                _logger.LogError(ex, "Error reading ffmpeg log");
             }
         }