diff options
Diffstat (limited to 'MediaBrowser.WebDashboard')
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs index b2d4f353e4..2dcb5e57e9 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs @@ -39,7 +39,7 @@ namespace MediaBrowser.WebDashboard.Api /// <returns>Task{IEnumerable{TaskInfo}}.</returns> protected override Task<DashboardInfo> GetDataToSend(object state) { - return Task.FromResult(DashboardService.GetDashboardInfo((Kernel)Kernel)); + return Task.FromResult(DashboardService.GetDashboardInfo((Kernel)Kernel, Logger)); } } } diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 50472423e0..41bde3c7f9 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -5,6 +5,7 @@ using MediaBrowser.Common.ScheduledTasks.Tasks; using MediaBrowser.Controller; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Plugins; +using MediaBrowser.Model.Logging; using MediaBrowser.Model.Tasks; using ServiceStack.ServiceHost; using ServiceStack.WebHost.Endpoints; @@ -97,18 +98,21 @@ namespace MediaBrowser.WebDashboard.Api { var kernel = (Kernel)Kernel; - return GetDashboardInfo(kernel); + return GetDashboardInfo(kernel, Logger); } /// <summary> /// Gets the dashboard info. /// </summary> /// <param name="kernel">The kernel.</param> + /// <param name="logger">The logger.</param> /// <returns>DashboardInfo.</returns> - public static DashboardInfo GetDashboardInfo(Kernel kernel) + public static DashboardInfo GetDashboardInfo(Kernel kernel, ILogger logger) { var connections = kernel.UserManager.ActiveConnections.ToArray(); + var dtoBuilder = new DtoBuilder(logger); + return new DashboardInfo { SystemInfo = kernel.GetSystemInfo(), @@ -121,7 +125,7 @@ namespace MediaBrowser.WebDashboard.Api ActiveConnections = connections, - Users = kernel.Users.Where(u => connections.Any(c => c.UserId == u.Id)).Select(DtoBuilder.GetDtoUser).ToArray() + Users = kernel.Users.Where(u => connections.Any(c => c.UserId == u.Id)).Select(dtoBuilder.GetDtoUser).ToArray() }; } |
