aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Devices
diff options
context:
space:
mode:
authorWilliam Taylor <me@willtaylor.info>2019-01-17 22:55:05 +0000
committerWilliam Taylor <me@willtaylor.info>2019-01-20 21:05:12 +0000
commit65cd3ed597c60503a517c06ad16c933ebf2434a9 (patch)
tree772d1d8d1b77a2363500dde7cf5a4d572fdf968f /Emby.Server.Implementations/Devices
parent0586598d33ea5eeed36259fe970a7e3184f6b087 (diff)
Replaced injections of ILogger with ILoggerFactory
This makes resolving dependencies from the container much easier as you cannot resolve with primitives parameters in a way that is any more readable. The aim of this commit is to change as little as possible with the end result, loggers that were newed up for the parent object were given the same name. Objects that used the base or app loggers, were given a new logger with an appropriate name. Also removed some unused dependencies.
Diffstat (limited to 'Emby.Server.Implementations/Devices')
-rw-r--r--Emby.Server.Implementations/Devices/DeviceId.cs7
-rw-r--r--Emby.Server.Implementations/Devices/DeviceManager.cs14
2 files changed, 17 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index 56e555937..00761809a 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -86,7 +86,10 @@ namespace Emby.Server.Implementations.Devices
private string _id;
- public DeviceId(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem)
+ public DeviceId(
+ IApplicationPaths appPaths,
+ ILoggerFactory loggerFactory,
+ IFileSystem fileSystem)
{
if (fileSystem == null)
{
@@ -94,7 +97,7 @@ namespace Emby.Server.Implementations.Devices
}
_appPaths = appPaths;
- _logger = logger;
+ _logger = loggerFactory.CreateLogger("SystemId");
_fileSystem = fileSystem;
}
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index f2ab28d4c..60d57519e 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -47,14 +47,24 @@ namespace Emby.Server.Implementations.Devices
private readonly object _cameraUploadSyncLock = new object();
private readonly object _capabilitiesSyncLock = new object();
- public DeviceManager(IAuthenticationRepository authRepo, IJsonSerializer json, ILibraryManager libraryManager, ILocalizationManager localizationManager, IUserManager userManager, IFileSystem fileSystem, ILibraryMonitor libraryMonitor, IServerConfigurationManager config, ILogger logger, INetworkManager network)
+ public DeviceManager(
+ IAuthenticationRepository authRepo,
+ IJsonSerializer json,
+ ILibraryManager libraryManager,
+ ILocalizationManager localizationManager,
+ IUserManager userManager,
+ IFileSystem fileSystem,
+ ILibraryMonitor libraryMonitor,
+ IServerConfigurationManager config,
+ ILoggerFactory loggerFactory,
+ INetworkManager network)
{
_json = json;
_userManager = userManager;
_fileSystem = fileSystem;
_libraryMonitor = libraryMonitor;
_config = config;
- _logger = logger;
+ _logger = loggerFactory.CreateLogger(nameof(DeviceManager));
_network = network;
_libraryManager = libraryManager;
_localizationManager = localizationManager;