Merge pull request #4 from jellyfin/dev

Dev

2 files changed, 8 insertions, 8 deletions

diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index 5e0323ddb..90cef5d06 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Text;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Devices
 {
@@ -34,7 +34,7 @@ namespace Emby.Server.Implementations.Devices
                         return value;
                     }
 
-                    _logger.Error("Invalid value found in device id file");
+                    _logger.LogError("Invalid value found in device id file");
                 }
             }
             catch (DirectoryNotFoundException)
@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.Devices
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error reading file", ex);
+                _logger.LogError(ex, "Error reading file");
             }
 
             return null;
@@ -66,7 +66,7 @@ namespace Emby.Server.Implementations.Devices
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error writing to file", ex);
+                _logger.LogError(ex, "Error writing to file");
             }
         }
 
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index 0fac886ef..250316211 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -6,7 +6,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Session;
@@ -289,7 +289,7 @@ namespace Emby.Server.Implementations.Devices
 
                 var list = history.FilesUploaded.ToList();
                 list.Add(file);
-                history.FilesUploaded = list.ToArray(list.Count);
+                history.FilesUploaded = list.ToArray();
 
                 _json.SerializeToFile(history, path);
             }
@@ -434,7 +434,7 @@ namespace Emby.Server.Implementations.Devices
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error creating camera uploads library", ex);
+                        _logger.LogError(ex, "Error creating camera uploads library");
                     }
 
                     _config.Configuration.CameraUploadUpgraded = true;
@@ -501,4 +501,4 @@ namespace Emby.Server.Implementations.Devices
             return config.GetConfiguration<DevicesOptions>("devices");
         }
     }
-}
\ No newline at end of file
+}