Use Microsoft.Extensions.Logging abstraction

18 files changed, 156 insertions, 162 deletions

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
index 0c7980ca0..327b0181a 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
@@ -8,7 +8,7 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.LiveTv.EmbyTV
 {
@@ -50,7 +50,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 onStarted();
 
-                _logger.Info("Copying recording stream to file {0}", targetFile);
+                _logger.LogInformation("Copying recording stream to file {0}", targetFile);
 
                 // The media source is infinite so we need to handle stopping ourselves
                 var durationToken = new CancellationTokenSource(duration);
@@ -59,7 +59,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 await directStreamProvider.CopyToAsync(output, cancellationToken).ConfigureAwait(false);
             }
 
-            _logger.Info("Recording completed to file {0}", targetFile);
+            _logger.LogInformation("Recording completed to file {0}", targetFile);
         }
 
         private async Task RecordFromMediaSource(MediaSourceInfo mediaSource, string targetFile, TimeSpan duration, Action onStarted, CancellationToken cancellationToken)
@@ -78,7 +78,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             using (var response = await _httpClient.SendAsync(httpRequestOptions, "GET").ConfigureAwait(false))
             {
-                _logger.Info("Opened recording stream from tuner provider");
+                _logger.LogInformation("Opened recording stream from tuner provider");
 
                 _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(targetFile));
 
@@ -86,7 +86,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     onStarted();
 
-                    _logger.Info("Copying recording stream to file {0}", targetFile);
+                    _logger.LogInformation("Copying recording stream to file {0}", targetFile);
 
                     // The media source if infinite so we need to handle stopping ourselves
                     var durationToken = new CancellationTokenSource(duration);
@@ -96,7 +96,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
             }
 
-            _logger.Info("Recording completed to file {0}", targetFile);
+            _logger.LogInformation("Recording completed to file {0}", targetFile);
         }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 167f2a84b..11cb57ff7 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Concurrent;
@@ -170,7 +170,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error creating virtual folder", ex);
+                        _logger.LogError("Error creating virtual folder", ex);
                     }
 
                     pathsAdded.AddRange(pathsToCreate);
@@ -196,13 +196,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error creating recording folders", ex);
+                _logger.LogError("Error creating recording folders", ex);
             }
         }
 
         private async Task RemovePathFromLibrary(string path)
         {
-            _logger.Debug("Removing path from library: {0}", path);
+            _logger.LogDebug("Removing path from library: {0}", path);
 
             var requiresRefresh = false;
             var virtualFolders = _libraryManager.GetVirtualFolders()
@@ -224,7 +224,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error removing virtual folder", ex);
+                        _logger.LogError("Error removing virtual folder", ex);
                     }
                 }
                 else
@@ -236,7 +236,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error removing media path", ex);
+                        _logger.LogError("Error removing media path", ex);
                     }
                 }
             }
@@ -342,7 +342,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting channels", ex);
+                    _logger.LogError("Error getting channels", ex);
                 }
             }
 
@@ -364,7 +364,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error adding metadata", ex);
+                        _logger.LogError("Error adding metadata", ex);
                     }
                 }
             }
@@ -406,7 +406,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 foreach (var channel in channels)
                 {
-                    _logger.Info("Found epg channel in {0} {1} {2} {3}", provider.Name, info.ListingsId, channel.Name, channel.Id);
+                    _logger.LogInformation("Found epg channel in {0} {1} {2} {3}", provider.Name, info.ListingsId, channel.Name, channel.Id);
                 }
 
                 result = new EpgChannelData(channels);
@@ -595,7 +595,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting channels", ex);
+                    _logger.LogError("Error getting channels", ex);
                 }
             }
 
@@ -718,7 +718,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             if (programInfo == null)
             {
-                _logger.Info("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
+                _logger.LogInformation("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
                 programInfo = GetProgramInfoFromCache(timer.ChannelId, timer.StartDate);
             }
 
@@ -984,11 +984,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 if (!IsListingProviderEnabledForTuner(provider.Item2, channel.TunerHostId))
                 {
-                    _logger.Debug("Skipping getting programs for channel {0}-{1} from {2}-{3}, because it's not enabled for this tuner.", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
+                    _logger.LogDebug("Skipping getting programs for channel {0}-{1} from {2}-{3}, because it's not enabled for this tuner.", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
                     continue;
                 }
 
-                _logger.Debug("Getting programs for channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
+                _logger.LogDebug("Getting programs for channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
 
                 var epgChannel = await GetEpgChannelFromTunerChannel(provider.Item1, provider.Item2, channel, cancellationToken).ConfigureAwait(false);
 
@@ -996,7 +996,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 if (epgChannel == null)
                 {
-                    _logger.Debug("EPG channel not found for tuner channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
+                    _logger.LogDebug("EPG channel not found for tuner channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
                     programs = new List<ProgramInfo>();
                 }
                 else
@@ -1042,7 +1042,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public async Task<ILiveStream> GetChannelStreamWithDirectStreamProvider(string channelId, string streamId, List<ILiveStream> currentLiveStreams, CancellationToken cancellationToken)
         {
-            _logger.Info("Streaming Channel " + channelId);
+            _logger.LogInformation("Streaming Channel " + channelId);
 
             var result = string.IsNullOrEmpty(streamId) ? 
                 null :
@@ -1052,7 +1052,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 result.ConsumerCount++;
 
-                _logger.Info("Live stream {0} consumer count is now {1}", streamId, result.ConsumerCount);
+                _logger.LogInformation("Live stream {0} consumer count is now {1}", streamId, result.ConsumerCount);
 
                 return result;
             }
@@ -1067,7 +1067,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                     result.OriginalStreamId = streamId;
 
-                    _logger.Info("Returning mediasource streamId {0}, mediaSource.Id {1}, mediaSource.LiveStreamId {2}", streamId, openedMediaSource.Id, openedMediaSource.LiveStreamId);
+                    _logger.LogInformation("Returning mediasource streamId {0}, mediaSource.Id {1}, mediaSource.LiveStreamId {2}", streamId, openedMediaSource.Id, openedMediaSource.LiveStreamId);
 
                     return result;
                 }
@@ -1174,7 +1174,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             var timer = e.Argument;
 
-            _logger.Info("Recording timer fired for {0}.", timer.Name);
+            _logger.LogInformation("Recording timer fired for {0}.", timer.Name);
 
             try
             {
@@ -1182,7 +1182,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 if (recordingEndDate <= DateTime.UtcNow)
                 {
-                    _logger.Warn("Recording timer fired for updatedTimer {0}, Id: {1}, but the program has already ended.", timer.Name, timer.Id);
+                    _logger.LogWarning("Recording timer fired for updatedTimer {0}, Id: {1}, but the program has already ended.", timer.Name, timer.Id);
                     OnTimerOutOfDate(timer);
                     return;
                 }
@@ -1190,7 +1190,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 var registration = await _liveTvManager.GetRegistrationInfo("dvr").ConfigureAwait(false);
                 if (!registration.IsValid)
                 {
-                    _logger.Warn("Emby Premiere required to use Emby DVR.");
+                    _logger.LogWarning("Emby Premiere required to use Emby DVR.");
                     OnTimerOutOfDate(timer);
                     return;
                 }
@@ -1208,7 +1208,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 else
                 {
-                    _logger.Info("Skipping RecordStream because it's already in progress.");
+                    _logger.LogInformation("Skipping RecordStream because it's already in progress.");
                 }
             }
             catch (OperationCanceledException)
@@ -1217,7 +1217,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error recording stream", ex);
+                _logger.LogError("Error recording stream", ex);
             }
         }
 
@@ -1342,7 +1342,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             if (programInfo == null)
             {
-                _logger.Info("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
+                _logger.LogInformation("Unable to find program with Id {0}. Will search using start date", timer.ProgramId);
                 programInfo = GetProgramInfoFromCache(timer.ChannelId, timer.StartDate);
             }
 
@@ -1390,9 +1390,9 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 var duration = recordingEndDate - DateTime.UtcNow;
 
-                _logger.Info("Beginning recording. Will record for {0} minutes.", duration.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+                _logger.LogInformation("Beginning recording. Will record for {0} minutes.", duration.TotalMinutes.ToString(CultureInfo.InvariantCulture));
 
-                _logger.Info("Writing file to path: " + recordPath);
+                _logger.LogInformation("Writing file to path: " + recordPath);
 
                 Action onStarted = async () =>
                 {
@@ -1414,16 +1414,16 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 await recorder.Record(directStreamProvider, mediaStreamInfo, recordPath, duration, onStarted, activeRecordingInfo.CancellationTokenSource.Token).ConfigureAwait(false);
 
                 recordingStatus = RecordingStatus.Completed;
-                _logger.Info("Recording completed: {0}", recordPath);
+                _logger.LogInformation("Recording completed: {0}", recordPath);
             }
             catch (OperationCanceledException)
             {
-                _logger.Info("Recording stopped: {0}", recordPath);
+                _logger.LogInformation("Recording stopped: {0}", recordPath);
                 recordingStatus = RecordingStatus.Completed;
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error recording to {0}", ex, recordPath);
+                _logger.LogError("Error recording to {0}", ex, recordPath);
                 recordingStatus = RecordingStatus.Error;
             }
 
@@ -1435,7 +1435,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error closing live stream", ex);
+                    _logger.LogError("Error closing live stream", ex);
                 }
             }
 
@@ -1450,7 +1450,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             if (recordingStatus != RecordingStatus.Completed && DateTime.UtcNow < timer.EndDate && timer.RetryCount < 10)
             {
                 const int retryIntervalSeconds = 60;
-                _logger.Info("Retrying recording in {0} seconds.", retryIntervalSeconds);
+                _logger.LogInformation("Retrying recording in {0} seconds.", retryIntervalSeconds);
 
                 timer.Status = RecordingStatus.New;
                 timer.PrePaddingSeconds = 0;
@@ -1511,20 +1511,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error deleting 0-byte failed recording file {0}", ex, path);
+                    _logger.LogError("Error deleting 0-byte failed recording file {0}", ex, path);
                 }
             }
         }
 
         private void TriggerRefresh(string path)
         {
-            _logger.Info("Triggering refresh on {0}", path);
+            _logger.LogInformation("Triggering refresh on {0}", path);
 
             var item = GetAffectedBaseItem(_fileSystem.GetDirectoryName(path));
 
             if (item != null)
             {
-                _logger.Info("Refreshing recording parent {0}", item.Path);
+                _logger.LogInformation("Refreshing recording parent {0}", item.Path);
 
                 _providerManager.QueueRefresh(item.Id, new MetadataRefreshOptions(_fileSystem)
                 {
@@ -1642,7 +1642,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error deleting item", ex);
+                        _logger.LogError("Error deleting item", ex);
                     }
                 }
             }
@@ -1668,7 +1668,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error deleting recording", ex);
+                    _logger.LogError("Error deleting recording", ex);
                 }
             }
         }
@@ -1773,14 +1773,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     UseShellExecute = false
                 });
 
-                _logger.Info("Running recording post processor {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
+                _logger.LogInformation("Running recording post processor {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
 
                 process.Exited += Process_Exited;
                 process.Start();
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error running recording post processor", ex);
+                _logger.LogError("Error running recording post processor", ex);
             }
         }
 
@@ -1794,7 +1794,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             var process = (IProcess)sender;
             try
             {
-                _logger.Info("Recording post-processing script completed with exit code {0}", process.ExitCode);
+                _logger.LogInformation("Recording post-processing script completed with exit code {0}", process.ExitCode);
             }
             catch
             {
@@ -1875,7 +1875,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error saving recording image", ex);
+                    _logger.LogError("Error saving recording image", ex);
                 }
             }
 
@@ -1890,7 +1890,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error saving recording image", ex);
+                        _logger.LogError("Error saving recording image", ex);
                     }
                 }
 
@@ -1903,7 +1903,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error saving recording image", ex);
+                        _logger.LogError("Error saving recording image", ex);
                     }
                 }
 
@@ -1916,7 +1916,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error saving recording image", ex);
+                        _logger.LogError("Error saving recording image", ex);
                     }
                 }
             }
@@ -1984,7 +1984,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error saving nfo", ex);
+                _logger.LogError("Error saving nfo", ex);
             }
         }
 
@@ -2790,7 +2790,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     if (!string.Equals(device.Url, configuredDevice.Url, StringComparison.OrdinalIgnoreCase))
                     {
-                        _logger.Info("Tuner url has changed from {0} to {1}", configuredDevice.Url, device.Url);
+                        _logger.LogInformation("Tuner url has changed from {0} to {1}", configuredDevice.Url, device.Url);
 
                         configuredDevice.Url = device.Url;
                         await _liveTvManager.SaveTunerHost(configuredDevice).ConfigureAwait(false);
@@ -2807,14 +2807,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 foreach (var device in discoveredDevices)
                 {
-                    _logger.Info("Discovered tuner device {0} at {1}", host.Name, device.Url);
+                    _logger.LogInformation("Discovered tuner device {0} at {1}", host.Name, device.Url);
                 }
 
                 return discoveredDevices;
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error discovering tuner devices", ex);
+                _logger.LogError("Error discovering tuner devices", ex);
 
                 return new List<TunerHostInfo>();
             }
@@ -2827,4 +2827,4 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             return manager.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index 9506a82be..af5e96c05 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -8,7 +8,6 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
-
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
@@ -18,7 +17,7 @@ using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Library;
@@ -78,7 +77,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             await RecordFromFile(mediaSource, mediaSource.Path, targetFile, duration, onStarted, cancellationToken).ConfigureAwait(false);
 
-            _logger.Info("Recording completed to file {0}", targetFile);
+            _logger.LogInformation("Recording completed to file {0}", targetFile);
         }
 
         private EncodingOptions GetEncodingOptions()
@@ -112,7 +111,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             _process = process;
 
             var commandLineLogMessage = process.StartInfo.FileName + " " + process.StartInfo.Arguments;
-            _logger.Info(commandLineLogMessage);
+            _logger.LogInformation(commandLineLogMessage);
 
             var logFilePath = Path.Combine(_appPaths.LogDirectoryPath, "record-transcode-" + Guid.NewGuid() + ".txt");
             _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(logFilePath));
@@ -137,7 +136,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
             StartStreamingLog(process.StandardError.BaseStream, _logFileStream);
 
-            _logger.Info("ffmpeg recording process started for {0}", _targetPath);
+            _logger.LogInformation("ffmpeg recording process started for {0}", _targetPath);
 
             return _taskCompletionSource.Task;
         }
@@ -270,14 +269,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 try
                 {
-                    _logger.Info("Stopping ffmpeg recording process for {0}", _targetPath);
+                    _logger.LogInformation("Stopping ffmpeg recording process for {0}", _targetPath);
 
                     //process.Kill();
                     _process.StandardInput.WriteLine("q");
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error stopping recording transcoding job for {0}", ex, _targetPath);
+                    _logger.LogError("Error stopping recording transcoding job for {0}", ex, _targetPath);
                 }
 
                 if (_hasExited)
@@ -287,7 +286,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 try
                 {
-                    _logger.Info("Calling recording process.WaitForExit for {0}", _targetPath);
+                    _logger.LogInformation("Calling recording process.WaitForExit for {0}", _targetPath);
 
                     if (_process.WaitForExit(10000))
                     {
@@ -296,7 +295,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error waiting for recording process to exit for {0}", ex, _targetPath);
+                    _logger.LogError("Error waiting for recording process to exit for {0}", ex, _targetPath);
                 }
 
                 if (_hasExited)
@@ -306,13 +305,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 try
                 {
-                    _logger.Info("Killing ffmpeg recording process for {0}", _targetPath);
+                    _logger.LogInformation("Killing ffmpeg recording process for {0}", _targetPath);
 
                     _process.Kill();
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error killing recording transcoding job for {0}", ex, _targetPath);
+                    _logger.LogError("Error killing recording transcoding job for {0}", ex, _targetPath);
                 }
             }
         }
@@ -330,7 +329,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 var exitCode = process.ExitCode;
 
-                _logger.Info("FFMpeg recording exited with code {0} for {1}", exitCode, _targetPath);
+                _logger.LogInformation("FFMpeg recording exited with code {0} for {1}", exitCode, _targetPath);
 
                 if (exitCode == 0)
                 {
@@ -343,7 +342,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch
             {
-                _logger.Error("FFMpeg recording exited with an error for {0}.", _targetPath);
+                _logger.LogError("FFMpeg recording exited with an error for {0}.", _targetPath);
                 _taskCompletionSource.TrySetException(new Exception(string.Format("Recording for {0} failed", _targetPath)));
             }
         }
@@ -358,7 +357,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error disposing recording log stream", ex);
+                    _logger.LogError("Error disposing recording log stream", ex);
                 }
 
                 _logFileStream = null;
@@ -388,8 +387,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error reading ffmpeg recording log", ex);
+                _logger.LogError("Error reading ffmpeg recording log", ex);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index 4ba2269a6..813a7a5f9 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
@@ -36,7 +36,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 if (_items == null)
                 {
-                    Logger.Info("Loading live tv data from {0}", _dataPath);
+                    Logger.LogInformation("Loading live tv data from {0}", _dataPath);
                     _items = GetItemsFromFile(_dataPath);
                 }
                 return _items.ToList();
@@ -59,7 +59,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error deserializing {0}", ex, jsonFile);
+                Logger.LogError("Error deserializing {0}", ex, jsonFile);
             }
             return new List<T>();
         }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
index 63cd26c7e..620ba7650 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
@@ -1,5 +1,5 @@
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
 using MediaBrowser.Model.IO;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
index b5f93b882..f00a54c7f 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Concurrent;
@@ -122,7 +122,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (startDate < now)
             {
-                EventHelper.FireEventIfNotNull(TimerFired, this, new GenericEventArgs<TimerInfo> { Argument = item }, Logger);
+                EventHelper.FireEventIfNotNull(TimerFired, this, new GenericEventArgs<TimerInfo> { Argument = item }, base.Logger);
                 return;
             }
 
@@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error scheduling wake timer", ex);
+                _logger.LogError("Error scheduling wake timer", ex);
             }
         }
 
@@ -153,12 +153,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (_timers.TryAdd(item.Id, timer))
             {
-                _logger.Info("Creating recording timer for {0}, {1}. Timer will fire in {2} minutes", item.Id, item.Name, dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+                _logger.LogInformation("Creating recording timer for {0}, {1}. Timer will fire in {2} minutes", item.Id, item.Name, dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
             }
             else
             {
                 timer.Dispose();
-                _logger.Warn("Timer already exists for item {0}", item.Id);
+                _logger.LogWarning("Timer already exists for item {0}", item.Id);
             }
         }
 
@@ -178,7 +178,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             var timer = GetAll().FirstOrDefault(i => string.Equals(i.Id, timerId, StringComparison.OrdinalIgnoreCase));
             if (timer != null)
             {
-                EventHelper.FireEventIfNotNull(TimerFired, this, new GenericEventArgs<TimerInfo> { Argument = timer }, Logger);
+                EventHelper.FireEventIfNotNull(TimerFired, this, new GenericEventArgs<TimerInfo> { Argument = timer }, base.Logger);
             }
         }
 
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 2d0eaf25b..48b4e5833 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
 using System;
@@ -80,7 +80,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             if (string.IsNullOrEmpty(token))
             {
-                _logger.Warn("SchedulesDirect token is empty, returning empty program list");
+                _logger.LogWarning("SchedulesDirect token is empty, returning empty program list");
                 return programsInfo;
             }
 
@@ -88,7 +88,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             string stationID = channelId;
 
-            _logger.Info("Channel Station ID is: " + stationID);
+            _logger.LogInformation("Channel Station ID is: " + stationID);
             List<ScheduleDirect.RequestScheduleForChannel> requestList =
                 new List<ScheduleDirect.RequestScheduleForChannel>()
                     {
@@ -100,7 +100,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                     };
 
             var requestString = _jsonSerializer.SerializeToString(requestList);
-            _logger.Debug("Request string for schedules is: " + requestString);
+            _logger.LogDebug("Request string for schedules is: " + requestString);
 
             var httpOptions = new HttpRequestOptions()
             {
@@ -120,7 +120,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 StreamReader reader = new StreamReader(response.Content);
                 string responseString = reader.ReadToEnd();
                 var dailySchedules = _jsonSerializer.DeserializeFromString<List<ScheduleDirect.Day>>(responseString);
-                _logger.Debug("Found " + dailySchedules.Count + " programs on " + stationID + " ScheduleDirect");
+                _logger.LogDebug("Found " + dailySchedules.Count + " programs on " + stationID + " ScheduleDirect");
 
                 httpOptions = new HttpRequestOptions()
                 {
@@ -161,7 +161,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                     var schedules = dailySchedules.SelectMany(d => d.programs);
                     foreach (ScheduleDirect.Program schedule in schedules)
                     {
-                        //_logger.Debug("Proccesing Schedule for statio ID " + stationID +
+                        //_logger.LogDebug("Proccesing Schedule for statio ID " + stationID +
                         //              " which corresponds to channel " + channelNumber + " and program id " +
                         //              schedule.programID + " which says it has images? " +
                         //              programDict[schedule.programID].hasImageArtwork);
@@ -453,7 +453,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                     url = apiUrl + "/image/" + uri;
                 }
             }
-            //_logger.Debug("URL for image is : " + url);
+            //_logger.LogDebug("URL for image is : " + url);
             return url;
         }
 
@@ -527,7 +527,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error getting image info from schedules direct", ex);
+                _logger.LogError("Error getting image info from schedules direct", ex);
 
                 return new List<ScheduleDirect.ShowImages>();
             }
@@ -578,14 +578,14 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                         }
                         else
                         {
-                            _logger.Info("No lineups available");
+                            _logger.LogInformation("No lineups available");
                         }
                     }
                 }
             }
             catch (Exception ex)
             {
-                _logger.Error("Error getting headends", ex);
+                _logger.LogError("Error getting headends", ex);
             }
 
             return lineups;
@@ -750,7 +750,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 CancellationToken = cancellationToken,
                 LogErrorResponseBody = true
             };
-            //_logger.Info("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
+            //_logger.LogInformation("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
             // httpOptions.RequestContent);
 
             using (var responce = await Post(httpOptions, false, null).ConfigureAwait(false))
@@ -758,7 +758,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Token>(responce.Content).ConfigureAwait(false);
                 if (root.message == "OK")
                 {
-                    _logger.Info("Authenticated with Schedules Direct token: " + root.token);
+                    _logger.LogInformation("Authenticated with Schedules Direct token: " + root.token);
                     return root.token;
                 }
 
@@ -780,7 +780,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 throw new ArgumentException("Listings Id required");
             }
 
-            _logger.Info("Adding new LineUp ");
+            _logger.LogInformation("Adding new LineUp ");
 
             var httpOptions = new HttpRequestOptions()
             {
@@ -823,7 +823,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 throw new Exception("token required");
             }
 
-            _logger.Info("Headends on account ");
+            _logger.LogInformation("Headends on account ");
 
             var options = new HttpRequestOptions()
             {
@@ -927,8 +927,8 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 using (var response = httpResponse.Content)
                 {
                     var root = await _jsonSerializer.DeserializeFromStreamAsync<ScheduleDirect.Channel>(response).ConfigureAwait(false);
-                    _logger.Info("Found " + root.map.Count + " channels on the lineup on ScheduleDirect");
-                    _logger.Info("Mapping Stations to Channel");
+                    _logger.LogInformation("Found " + root.map.Count + " channels on the lineup on ScheduleDirect");
+                    _logger.LogInformation("Mapping Stations to Channel");
 
                     var allStations = root.stations ?? new List<ScheduleDirect.Station>();
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
index b0ffd057d..cc8840e14 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -7,7 +7,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;
 using System.Threading;
@@ -376,7 +376,7 @@ namespace Emby.Server.Implementations.LiveTv
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error getting image info for {0}", ex, info.Name);
+                _logger.LogError("Error getting image info for {0}", ex, info.Name);
             }
 
             return null;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index e4400220e..5c0f76ba1 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -14,7 +14,7 @@ using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 using System;
@@ -263,7 +263,7 @@ namespace Emby.Server.Implementations.LiveTv
             var channel = (LiveTvChannel)_libraryManager.GetItemById(id);
             isVideo = channel.ChannelType == ChannelType.TV;
             service = GetService(channel);
-            _logger.Info("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
+            _logger.LogInformation("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
 
             var supportsManagedStream = service as ISupportsDirectStreamProvider;
             if (supportsManagedStream != null)
@@ -282,7 +282,7 @@ namespace Emby.Server.Implementations.LiveTv
                 var startTime = DateTime.UtcNow;
                 await liveStream.Open(cancellationToken).ConfigureAwait(false);
                 var endTime = DateTime.UtcNow;
-                _logger.Info("Live stream opened after {0}ms", (endTime - startTime).TotalMilliseconds);
+                _logger.LogInformation("Live stream opened after {0}ms", (endTime - startTime).TotalMilliseconds);
             }
             info.RequiresClosing = true;
 
@@ -1093,7 +1093,7 @@ namespace Emby.Server.Implementations.LiveTv
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                _logger.Debug("Refreshing guide from {0}", service.Name);
+                _logger.LogDebug("Refreshing guide from {0}", service.Name);
 
                 try
                 {
@@ -1112,7 +1112,7 @@ namespace Emby.Server.Implementations.LiveTv
                 catch (Exception ex)
                 {
                     cleanDatabase = false;
-                    _logger.ErrorException("Error refreshing channels for service", ex);
+                    _logger.LogError("Error refreshing channels for service", ex);
                 }
 
                 numComplete++;
@@ -1175,7 +1175,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting channel information for {0}", ex, channelInfo.Item2.Name);
+                    _logger.LogError("Error getting channel information for {0}", ex, channelInfo.Item2.Name);
                 }
 
                 numComplete++;
@@ -1193,7 +1193,7 @@ namespace Emby.Server.Implementations.LiveTv
 
             var guideDays = GetGuideDays();
 
-            _logger.Info("Refreshing guide with {0} days of guide data", guideDays);
+            _logger.LogInformation("Refreshing guide with {0} days of guide data", guideDays);
 
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -1269,7 +1269,7 @@ namespace Emby.Server.Implementations.LiveTv
                         }
                     }
 
-                    _logger.Debug("Channel {0} has {1} new programs and {2} updated programs", currentChannel.Name, newPrograms.Count, updatedPrograms.Count);
+                    _logger.LogDebug("Channel {0} has {1} new programs and {2} updated programs", currentChannel.Name, newPrograms.Count, updatedPrograms.Count);
 
                     if (newPrograms.Count > 0)
                     {
@@ -1304,7 +1304,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting programs for channel {0}", ex, currentChannel.Name);
+                    _logger.LogError("Error getting programs for channel {0}", ex, currentChannel.Name);
                 }
 
                 numComplete++;
@@ -1649,7 +1649,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting recordings", ex);
+                    _logger.LogError("Error getting recordings", ex);
                     return new List<Tuple<TimerInfo, ILiveTvService>>();
                 }
             });
@@ -1725,7 +1725,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting recordings", ex);
+                    _logger.LogError("Error getting recordings", ex);
                     return new List<Tuple<TimerInfo, ILiveTvService>>();
                 }
             });
@@ -1880,7 +1880,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting recordings", ex);
+                    _logger.LogError("Error getting recordings", ex);
                     return new List<Tuple<SeriesTimerInfo, ILiveTvService>>();
                 }
             });
@@ -1926,7 +1926,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error getting recordings", ex);
+                    _logger.LogError("Error getting recordings", ex);
                     return new List<Tuple<SeriesTimerInfo, ILiveTvService>>();
                 }
             });
@@ -2162,7 +2162,7 @@ namespace Emby.Server.Implementations.LiveTv
                 await service.CreateTimerAsync(info, cancellationToken).ConfigureAwait(false);
             }
 
-            _logger.Info("New recording scheduled");
+            _logger.LogInformation("New recording scheduled");
 
             if (!(service is EmbyTV.EmbyTV))
             {
@@ -2183,7 +2183,7 @@ namespace Emby.Server.Implementations.LiveTv
 
             if (!registration.IsValid)
             {
-                _logger.Info("Creating series recordings requires an active Emby Premiere subscription.");
+                _logger.LogInformation("Creating series recordings requires an active Emby Premiere subscription.");
                 return;
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index 26a84a275..d13f08b1b 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
 using System;
@@ -29,14 +29,14 @@ namespace Emby.Server.Implementations.LiveTv
         private readonly IServerApplicationHost _appHost;
         private IApplicationPaths _appPaths;
 
-        public LiveTvMediaSourceProvider(ILiveTvManager liveTvManager, IApplicationPaths appPaths, IJsonSerializer jsonSerializer, ILogManager logManager, IMediaSourceManager mediaSourceManager, IMediaEncoder mediaEncoder, IServerApplicationHost appHost)
+        public LiveTvMediaSourceProvider(ILiveTvManager liveTvManager, IApplicationPaths appPaths, IJsonSerializer jsonSerializer, ILoggerFactory loggerFactory, IMediaSourceManager mediaSourceManager, IMediaEncoder mediaEncoder, IServerApplicationHost appHost)
         {
             _liveTvManager = liveTvManager;
             _jsonSerializer = jsonSerializer;
             _mediaSourceManager = mediaSourceManager;
             _mediaEncoder = mediaEncoder;
             _appHost = appHost;
-            _logger = logManager.GetLogger(GetType().Name);
+            _logger = loggerFactory.CreateLogger(GetType().Name);
             _appPaths = appPaths;
         }
 
@@ -116,7 +116,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
             }
 
-            _logger.Debug("MediaSources: {0}", _jsonSerializer.SerializeToString(list));
+            _logger.LogDebug("MediaSources: {0}", _jsonSerializer.SerializeToString(list));
 
             return list;
         }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
index ca5e51971..97c33f1fa 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
@@ -2,7 +2,7 @@
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             var result = await GetChannelsInternal(tuner, cancellationToken).ConfigureAwait(false);
             var list = result.ToList();
-            //Logger.Info("Channels from {0}: {1}", tuner.Url, JsonSerializer.SerializeToString(list));
+            //logger.LogInformation("Channels from {0}: {1}", tuner.Url, JsonSerializer.SerializeToString(list));
 
             if (!string.IsNullOrEmpty(key) && list.Count > 0)
             {
@@ -114,7 +114,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error getting channel list", ex);
+                    Logger.LogError("Error getting channel list", ex);
 
                     if (enableCache)
                     {
@@ -161,7 +161,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     }
                     catch (Exception ex)
                     {
-                        Logger.Error("Error getting channels", ex);
+                        Logger.LogError("Error getting channels", ex);
                     }
                 }
             }
@@ -201,7 +201,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error("Error getting channels", ex);
+                    Logger.LogError("Error getting channels", ex);
                 }
             }
 
@@ -216,12 +216,12 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     var startTime = DateTime.UtcNow;
                     await liveStream.Open(cancellationToken).ConfigureAwait(false);
                     var endTime = DateTime.UtcNow;
-                    Logger.Info("Live stream opened after {0}ms", (endTime - startTime).TotalMilliseconds);
+                    Logger.LogInformation("Live stream opened after {0}ms", (endTime - startTime).TotalMilliseconds);
                     return liveStream;
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error("Error opening tuner", ex);
+                    Logger.LogError("Error opening tuner", ex);
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index e873eb8e9..a8d1dcaa3 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
 using System;
@@ -303,7 +303,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error getting tuner info", ex);
+                    Logger.LogError("Error getting tuner info", ex);
                 }
             }
 
@@ -581,7 +581,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
         {
             var profile = streamId.Split('_')[0];
 
-            Logger.Info("GetChannelStream: channel id: {0}. stream id: {1} profile: {2}", channelInfo.Id, streamId, profile);
+            Logger.LogInformation("GetChannelStream: channel id: {0}. stream id: {1} profile: {2}", channelInfo.Id, streamId, profile);
 
             var hdhrId = GetHdHrIdFromChannelId(channelInfo.Id);
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index 2bc5a0ed3..0e84622bd 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -6,7 +6,7 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Controller.LiveTv;
 using System.Net;
 
@@ -244,7 +244,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
         private async Task ReleaseLockkey(ISocket tcpClient, uint lockKeyValue)
         {
-            _logger.Info("HdHomerunManager.ReleaseLockkey {0}", lockKeyValue);
+            _logger.LogInformation("HdHomerunManager.ReleaseLockkey {0}", lockKeyValue);
 
             var ipEndPoint = new IpEndPointInfo(_remoteIp, HdHomeRunPort);
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
index 33103979e..933c34124 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
@@ -7,7 +7,7 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.LiveTv;
@@ -56,7 +56,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
 
-            Logger.Info("Opening HDHR UDP Live stream from {0}", uri.Host);
+            Logger.LogInformation("Opening HDHR UDP Live stream from {0}", uri.Host);
 
             var remoteAddress = IPAddress.Parse(uri.Host);
             var embyRemoteAddress = _networkManager.ParseIpAddress(uri.Host);
@@ -71,7 +71,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 }
                 catch (Exception)
                 {
-                    Logger.Error("Unable to determine local ip address for Legacy HDHomerun stream.");
+                    Logger.LogError("Unable to determine local ip address for Legacy HDHomerun stream.");
                     return;
                 }
             }
@@ -92,7 +92,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     {
                         if (!(ex is OperationCanceledException))
                         {
-                            Logger.ErrorException("Error opening live stream:", ex);
+                            Logger.LogError("Error opening live stream:", ex);
                         }
                         throw;
                     }
@@ -131,12 +131,12 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                         }
                         catch (OperationCanceledException ex)
                         {
-                            Logger.Info("HDHR UDP stream cancelled or timed out from {0}", remoteAddress);
+                            Logger.LogInformation("HDHR UDP stream cancelled or timed out from {0}", remoteAddress);
                             openTaskCompletionSource.TrySetException(ex);
                         }
                         catch (Exception ex)
                         {
-                            Logger.ErrorException("Error opening live stream:", ex);
+                            Logger.LogError("Error opening live stream:", ex);
                             openTaskCompletionSource.TrySetException(ex);
                         }
 
@@ -346,4 +346,4 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
index 7e0ac4131..b1eda3b7f 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
@@ -8,7 +8,7 @@ using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.LiveTv;
 using System.Linq;
@@ -75,7 +75,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
         {
             EnableStreamSharing = false;
 
-            Logger.Info("Closing " + GetType().Name);
+            Logger.LogInformation("Closing " + GetType().Name);
 
             LiveStreamCancellationTokenSource.Cancel();
 
@@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error closing live stream", ex);
+                Logger.LogError("Error closing live stream", ex);
             }
         }
 
@@ -120,7 +120,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
         {
             if (retryCount == 0)
             {
-                Logger.Info("Deleting temp files {0}", string.Join(", ", paths.ToArray()));
+                Logger.LogInformation("Deleting temp files {0}", string.Join(", ", paths.ToArray()));
             }
 
             var failedFiles = new List<string>();
@@ -139,7 +139,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    //Logger.ErrorException("Error deleting file {0}", ex, path);
+                    //Logger.LogError("Error deleting file {0}", ex, path);
                     failedFiles.Add(path);
                 }
             }
@@ -181,14 +181,14 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 isLastFile = nextFileInfo.Item2;
             }
 
-            Logger.Info("Live Stream ended.");
+            Logger.LogInformation("Live Stream ended.");
         }
 
         private Tuple<string, bool> GetNextFile(string currentFile)
         {
             var files = GetStreamFilePaths();
 
-            //Logger.Info("Live stream files: {0}", string.Join(", ", files.ToArray()));
+            //logger.LogInformation("Live stream files: {0}", string.Join(", ", files.ToArray()));
 
             if (string.IsNullOrEmpty(currentFile))
             {
@@ -204,7 +204,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
         private async Task CopyFile(string path, bool seekFile, int emptyReadLimit, bool allowAsync, Stream stream, CancellationToken cancellationToken)
         {
-            //Logger.Info("Opening live stream file {0}. Empty read limit: {1}", path, emptyReadLimit);
+            //logger.LogInformation("Opening live stream file {0}. Empty read limit: {1}", path, emptyReadLimit);
 
             using (var inputStream = (FileStream)GetInputStream(path, allowAsync))
             {
@@ -227,7 +227,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
         private void TrySeek(FileStream stream, long offset)
         {
-            //Logger.Info("TrySeek live stream");
+            //logger.LogInformation("TrySeek live stream");
             try
             {
                 stream.Seek(offset, SeekOrigin.End);
@@ -242,7 +242,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error seeking stream", ex);
+                Logger.LogError("Error seeking stream", ex);
             }
         }
     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index a1bff2b5b..a54bd1613 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -3,7 +3,7 @@ using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.MediaInfo;
 using System;
 using System.Collections.Generic;
@@ -205,4 +205,4 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             return Task.FromResult(new List<TunerHostInfo>());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index ca744b615..208225c1e 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Extensions;
 
 namespace Emby.Server.Implementations.LiveTv.TunerHosts
@@ -88,7 +88,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 if (line.StartsWith(ExtInfPrefix, StringComparison.OrdinalIgnoreCase))
                 {
                     extInf = line.Substring(ExtInfPrefix.Length).Trim();
-                    _logger.Info("Found m3u channel: {0}", extInf);
+                    _logger.LogInformation("Found m3u channel: {0}", extInf);
                 }
                 else if (!string.IsNullOrWhiteSpace(extInf) && !line.StartsWith("#", StringComparison.OrdinalIgnoreCase))
                 {
@@ -335,4 +335,4 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             return dict;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index 572edb167..ca53036a4 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -9,7 +9,7 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.System;
 using System.Globalization;
@@ -44,7 +44,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
 
             var typeName = GetType().Name;
-            Logger.Info("Opening " + typeName + " Live stream from {0}", url);
+            Logger.LogInformation("Opening " + typeName + " Live stream from {0}", url);
 
             var httpRequestOptions = new HttpRequestOptions
             {
@@ -125,17 +125,12 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             {
                 try
                 {
+                    Logger.LogInformation("Beginning {0} stream to {1}", GetType().Name, TempFilePath);
                     using (response)
+                    using (var stream = response.Content)
+                    using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
                     {
-                        using (var stream = response.Content)
-                        {
-                            Logger.Info("Beginning {0} stream to {1}", GetType().Name, TempFilePath);
-
-                            using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
-                            {
-                                await ApplicationHost.StreamHelper.CopyToAsync(stream, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken).ConfigureAwait(false);
-                            }
-                        }
+                        await ApplicationHost.StreamHelper.CopyToAsync(stream, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken).ConfigureAwait(false);
                     }
                 }
                 catch (OperationCanceledException)
@@ -143,7 +138,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error copying live stream.", ex);
+                    Logger.LogError("Error copying live stream.", ex);
                 }
                 EnableStreamSharing = false;
                 await DeleteTempFiles(new List<string> { TempFilePath }).ConfigureAwait(false);