Merge pull request #4 from jellyfin/dev

Dev

1 files changed, 18 insertions, 40 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 64372c072..a661d7691 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -9,7 +9,6 @@ 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.Serialization;
 using System;
@@ -25,6 +24,7 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.System;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
@@ -102,8 +102,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             _originalFFMpegPath = ffMpegPath;
 
             _hasExternalEncoder = hasExternalEncoder;
-
-            SetEnvironmentVariable();
         }
 
         private readonly object _logLock = new object();
@@ -117,7 +115,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error setting FFREPORT environment variable", ex);
+                    _logger.LogError(ex, "Error setting FFREPORT environment variable");
                 }
             }
         }
@@ -132,31 +130,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
                 catch (Exception ex)
                 {
-                    //_logger.ErrorException("Error setting FFREPORT environment variable", ex);
+                    _logger.LogError(ex, "Error setting FFREPORT environment variable");
                 }
             }
         }
 
-        private void SetEnvironmentVariable()
-        {
-            try
-            {
-                //_environmentInfo.SetProcessEnvironmentVariable("FFREPORT", "file=program-YYYYMMDD-HHMMSS.txt:level=32");
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error setting FFREPORT environment variable", ex);
-            }
-            try
-            {
-                //_environmentInfo.SetUserEnvironmentVariable("FFREPORT", "file=program-YYYYMMDD-HHMMSS.txt:level=32");
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error setting FFREPORT environment variable", ex);
-            }
-        }
-
         public string EncoderLocationType
         {
             get
@@ -252,7 +230,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 return;
             }
 
-            _logger.Info("Attempting to update encoder path to {0}. pathType: {1}", path ?? string.Empty, pathType ?? string.Empty);
+            _logger.LogInformation("Attempting to update encoder path to {0}. pathType: {1}", path ?? string.Empty, pathType ?? string.Empty);
 
             Tuple<string, string> newPaths;
 
@@ -414,8 +392,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private void LogPaths()
         {
-            _logger.Info("FFMpeg: {0}", FFMpegPath ?? "not found");
-            _logger.Info("FFProbe: {0}", FFProbePath ?? "not found");
+            _logger.LogInformation("FFMpeg: {0}", FFMpegPath ?? "not found");
+            _logger.LogInformation("FFProbe: {0}", FFProbePath ?? "not found");
         }
 
         private EncodingOptions GetEncodingOptions()
@@ -557,11 +535,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             if (forceEnableLogging)
             {
-                _logger.Info("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
+                _logger.LogInformation("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
             }
             else
             {
-                _logger.Debug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
+                _logger.LogDebug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
             }
 
             using (var processWrapper = new ProcessWrapper(process, this, _logger))
@@ -649,9 +627,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     throw;
                 }
-                catch
+                catch (Exception ex)
                 {
-                    _logger.Error("I-frame image extraction failed, will attempt standard way. Input: {0}", inputArgument);
+                    _logger.LogError(ex, "I-frame image extraction failed, will attempt standard way. Input: {arguments}", inputArgument);
                 }
             }
 
@@ -755,7 +733,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 ErrorDialog = false
             });
 
-            _logger.Debug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
+            _logger.LogDebug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
 
             using (var processWrapper = new ProcessWrapper(process, this, _logger))
             {
@@ -783,7 +761,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     var msg = string.Format("ffmpeg image extraction failed for {0}", inputPath);
 
-                    _logger.Error(msg);
+                    _logger.LogError(msg);
 
                     throw new Exception(msg);
                 }
@@ -877,7 +855,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 ErrorDialog = false
             });
 
-            _logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
+            _logger.LogInformation(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
 
             await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
 
@@ -929,7 +907,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     var msg = string.Format("ffmpeg image extraction failed for {0}", inputArgument);
 
-                    _logger.Error(msg);
+                    _logger.LogError(msg);
 
                     throw new Exception(msg);
                 }
@@ -961,7 +939,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             IProgress<double> progress,
             CancellationToken cancellationToken)
         {
-            _logger.Error("EncodeVideo");
+            _logger.LogError("EncodeVideo");
             var job = await new VideoEncoder(this,
                 _logger,
                 ConfigurationManager,
@@ -999,18 +977,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
             catch (Exception ex)
             {
-                _logger.Error("Error in WaitForExit", ex);
+                _logger.LogError(ex, "Error in WaitForExit");
             }
 
             try
             {
-                _logger.Info("Killing ffmpeg process");
+                _logger.LogInformation("Killing ffmpeg process");
 
                 process.Process.Kill();
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error killing process", ex);
+                _logger.LogError(ex, "Error killing process");
             }
         }