Fix exception logging

5 files changed, 48 insertions, 54 deletions

diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
index 97c33f1fa8..ef2010ba64 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
@@ -114,7 +114,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error getting channel list", ex);
+                    Logger.LogError(ex, "Error getting channel list");
 
                     if (enableCache)
                     {
@@ -161,7 +161,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error getting channels", ex);
+                        Logger.LogError(ex, "Error getting channels");
                     }
                 }
             }
@@ -201,7 +201,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error getting channels", ex);
+                    Logger.LogError(ex, "Error getting channels");
                 }
             }
 
@@ -221,7 +221,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error opening tuner", ex);
+                    Logger.LogError(ex, "Error opening tuner");
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index a8d1dcaa31..be090df0c9 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -303,7 +303,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error getting tuner info", ex);
+                    Logger.LogError(ex, "Error getting tuner info");
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
index 933c341242..c781bccbb7 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
@@ -56,7 +56,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
 
-            Logger.LogInformation("Opening HDHR UDP Live stream from {0}", uri.Host);
+            Logger.LogInformation("Opening HDHR UDP Live stream from {host}", uri.Host);
 
             var remoteAddress = IPAddress.Parse(uri.Host);
             var embyRemoteAddress = _networkManager.ParseIpAddress(uri.Host);
@@ -69,9 +69,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     localAddress = ((IPEndPoint)tcpSocket.LocalEndPoint).Address;
                     tcpSocket.Close();
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-                    Logger.LogError("Unable to determine local ip address for Legacy HDHomerun stream.");
+                    Logger.LogError(ex, "Unable to determine local ip address for Legacy HDHomerun stream.");
                     return;
                 }
             }
@@ -87,21 +87,19 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             catch (Exception ex)
             {
                 using (udpClient)
+                using (hdHomerunManager)
                 {
-                    using (hdHomerunManager)
+                    if (!(ex is OperationCanceledException))
                     {
-                        if (!(ex is OperationCanceledException))
-                        {
-                            Logger.LogError("Error opening live stream:", ex);
-                        }
-                        throw;
+                        Logger.LogError(ex, "Error opening live stream:");
                     }
+                    throw;
                 }
             }
 
             var taskCompletionSource = new TaskCompletionSource<bool>();
 
-            StartStreaming(udpClient, hdHomerunManager, remoteAddress, taskCompletionSource, LiveStreamCancellationTokenSource.Token);
+            await StartStreaming(udpClient, hdHomerunManager, remoteAddress, taskCompletionSource, LiveStreamCancellationTokenSource.Token);
 
             //OpenedMediaSource.Protocol = MediaProtocol.File;
             //OpenedMediaSource.Path = tempFile;
@@ -122,26 +120,24 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             return Task.Run(async () =>
             {
                 using (udpClient)
+                using (hdHomerunManager)
                 {
-                    using (hdHomerunManager)
+                    try
                     {
-                        try
-                        {
-                            await CopyTo(udpClient, TempFilePath, openTaskCompletionSource, cancellationToken).ConfigureAwait(false);
-                        }
-                        catch (OperationCanceledException ex)
-                        {
-                            Logger.LogInformation("HDHR UDP stream cancelled or timed out from {0}", remoteAddress);
-                            openTaskCompletionSource.TrySetException(ex);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.LogError("Error opening live stream:", ex);
-                            openTaskCompletionSource.TrySetException(ex);
-                        }
-
-                        EnableStreamSharing = false;
+                        await CopyTo(udpClient, TempFilePath, openTaskCompletionSource, cancellationToken).ConfigureAwait(false);
                     }
+                    catch (OperationCanceledException ex)
+                    {
+                        Logger.LogInformation("HDHR UDP stream cancelled or timed out from {0}", remoteAddress);
+                        openTaskCompletionSource.TrySetException(ex);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError(ex, "Error opening live stream:");
+                        openTaskCompletionSource.TrySetException(ex);
+                    }
+
+                    EnableStreamSharing = false;
                 }
 
                 await DeleteTempFiles(new List<string> { TempFilePath }).ConfigureAwait(false);
@@ -166,30 +162,28 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             var resolved = false;
 
             using (var source = _socketFactory.CreateNetworkStream(udpClient, false))
+            using (var fileStream = FileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
             {
-                using (var fileStream = FileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
-                {
-                    var currentCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, new CancellationTokenSource(TimeSpan.FromSeconds(30)).Token).Token;
+                var currentCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, new CancellationTokenSource(TimeSpan.FromSeconds(30)).Token).Token;
 
-                    while ((read = await source.ReadAsync(buffer, 0, buffer.Length, currentCancellationToken).ConfigureAwait(false)) != 0)
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
+                while ((read = await source.ReadAsync(buffer, 0, buffer.Length, currentCancellationToken).ConfigureAwait(false)) != 0)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
 
-                        currentCancellationToken = cancellationToken;
+                    currentCancellationToken = cancellationToken;
 
-                        read -= RtpHeaderBytes;
+                    read -= RtpHeaderBytes;
 
-                        if (read > 0)
-                        {
-                            fileStream.Write(buffer, RtpHeaderBytes, read);
-                        }
+                    if (read > 0)
+                    {
+                        fileStream.Write(buffer, RtpHeaderBytes, read);
+                    }
 
-                        if (!resolved)
-                        {
-                            resolved = true;
-                            DateOpened = DateTime.UtcNow;
-                            Resolve(openTaskCompletionSource);
-                        }
+                    if (!resolved)
+                    {
+                        resolved = true;
+                        DateOpened = DateTime.UtcNow;
+                        Resolve(openTaskCompletionSource);
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
index b1eda3b7f2..4a2b4ebb22 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
@@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error closing live stream", ex);
+                Logger.LogError(ex, "Error closing live stream");
             }
         }
 
@@ -139,7 +139,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    //Logger.LogError("Error deleting file {0}", ex, path);
+                    Logger.LogError(ex, "Error deleting file {path}", path);
                     failedFiles.Add(path);
                 }
             }
@@ -242,7 +242,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error seeking stream", ex);
+                Logger.LogError(ex, "Error seeking stream");
             }
         }
     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index ca53036a41..9b10daba0d 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -138,7 +138,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error copying live stream.", ex);
+                    Logger.LogError(ex, "Error copying live stream.");
                 }
                 EnableStreamSharing = false;
                 await DeleteTempFiles(new List<string> { TempFilePath }).ConfigureAwait(false);