Fix exception logging

8 files changed, 11 insertions, 14 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 9ba80da698..6393a9f193 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1414,7 +1414,7 @@ namespace MediaBrowser.Controller.Entities
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error refreshing owned items for {0}", ex, Path ?? Name);
+                    Logger.LogError(ex, "Error refreshing owned items for {path}", Path ?? Name);
                 }
             }
 
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index dbec03a212..7292b166a0 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -105,7 +105,7 @@ namespace MediaBrowser.Controller.Entities
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading library options", ex);
+                Logger.LogError(ex, "Error loading library options");
 
                 return new LibraryOptions();
             }
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index e9352ce400..dbe30f9a51 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -303,7 +303,7 @@ namespace MediaBrowser.Controller.Entities
                 var id = child.Id;
                 if (dictionary.ContainsKey(id))
                 {
-                    Logger.LogError("Found folder containing items with duplicate id. Path: {0}, Child Name: {1}",
+                    Logger.LogError("Found folder containing items with duplicate id. Path: {path}, Child Name: {ChildName}",
                         Path ?? Name,
                         child.Path ?? child.Name);
                 }
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 6d5126a445..b50a12d520 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -259,10 +259,9 @@ namespace MediaBrowser.Controller.Entities
                     {
                         return _libraryManager.GetGenre(i);
                     }
-                    catch
+                    catch (Exception ex)
                     {
-                        // Full exception logged at lower levels
-                        _logger.LogError("Error getting genre");
+                        _logger.LogError(ex, "Error getting genre");
                         return null;
                     }
 
@@ -383,10 +382,9 @@ namespace MediaBrowser.Controller.Entities
                     {
                         return _libraryManager.GetGenre(i);
                     }
-                    catch
+                    catch (Exception ex)
                     {
-                        // Full exception logged at lower levels
-                        _logger.LogError("Error getting genre");
+                        _logger.LogError(ex, "Error getting genre");
                         return null;
                     }
 
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 37d507753c..c0cf51ab24 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Controller.IO
                     }
                     catch (Exception ex)
                     {
-                        logger.LogError("Error resolving shortcut from {0}", ex, fullName);
+                        logger.LogError(ex, "Error resolving shortcut from {path}", fullName);
                     }
                 }
                 else if (flattenFolderDepth > 0 && isDirectory)
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 3ec4e3bb7b..c8c2367e68 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -727,7 +727,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             return count;
         }
-
         protected void DisposeIsoMount()
         {
             if (IsoMount != null)
diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index bac7e0184c..5abbadcc72 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -232,7 +232,7 @@ namespace MediaBrowser.Controller.Net
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error sending web socket message {0}", ex, Name);
+                Logger.LogError(ex, "Error sending web socket message {Name}", Name);
                 DisposeConnection(tuple);
             }
         }
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index 65ff43cf95..98848a4402 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -337,7 +337,7 @@ namespace MediaBrowser.Controller.Session
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error reporting playback progress", ex);
+                _logger.LogError(ex, "Error reporting playback progress");
             }
         }
 
@@ -379,7 +379,7 @@ namespace MediaBrowser.Controller.Session
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error disposing session controller", ex);
+                        _logger.LogError(ex, "Error disposing session controller");
                     }
                 }
             }