aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/System
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-11-23 10:46:16 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-11-23 10:46:16 -0500
commit4f09c1e06dab7cc8b260129648f5a54c77b8a4f9 (patch)
tree84666fd94143a2078c4ad2500301cd0c21a94c61 /MediaBrowser.Api/System
parent77695f8abed3156de04c6bb2496c14a2ab3d90a8 (diff)
reduce dlna chatter
Diffstat (limited to 'MediaBrowser.Api/System')
-rw-r--r--MediaBrowser.Api/System/ActivityLogWebSocketListener.cs3
-rw-r--r--MediaBrowser.Api/System/SystemInfoWebSocketListener.cs5
-rw-r--r--MediaBrowser.Api/System/SystemService.cs5
3 files changed, 8 insertions, 5 deletions
diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
index 793f745713..f9cac7389d 100644
--- a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
+++ b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Threading;
+using System.Threading;
namespace MediaBrowser.Api.System
{
@@ -43,7 +44,7 @@ namespace MediaBrowser.Api.System
/// </summary>
/// <param name="state">The state.</param>
/// <returns>Task{SystemInfo}.</returns>
- protected override Task<List<ActivityLogEntry>> GetDataToSend(WebSocketListenerState state)
+ protected override Task<List<ActivityLogEntry>> GetDataToSend(WebSocketListenerState state, CancellationToken CancellationToken)
{
return Task.FromResult(new List<ActivityLogEntry>());
}
diff --git a/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
index 8d74cc66c0..63847f2b52 100644
--- a/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Model.Logging;
using MediaBrowser.Model.System;
using System.Threading.Tasks;
using MediaBrowser.Model.Threading;
+using System.Threading;
namespace MediaBrowser.Api.System
{
@@ -40,9 +41,9 @@ namespace MediaBrowser.Api.System
/// </summary>
/// <param name="state">The state.</param>
/// <returns>Task{SystemInfo}.</returns>
- protected override Task<SystemInfo> GetDataToSend(WebSocketListenerState state)
+ protected override Task<SystemInfo> GetDataToSend(WebSocketListenerState state, CancellationToken cancellationToken)
{
- return _appHost.GetSystemInfo();
+ return _appHost.GetSystemInfo(cancellationToken);
}
}
}
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index d850b2ce72..6de7dd98ba 100644
--- a/MediaBrowser.Api/System/SystemService.cs
+++ b/MediaBrowser.Api/System/SystemService.cs
@@ -14,6 +14,7 @@ using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Services;
+using System.Threading;
namespace MediaBrowser.Api.System
{
@@ -164,14 +165,14 @@ namespace MediaBrowser.Api.System
/// <returns>System.Object.</returns>
public async Task<object> Get(GetSystemInfo request)
{
- var result = await _appHost.GetSystemInfo().ConfigureAwait(false);
+ var result = await _appHost.GetSystemInfo(CancellationToken.None).ConfigureAwait(false);
return ToOptimizedResult(result);
}
public async Task<object> Get(GetPublicSystemInfo request)
{
- var result = await _appHost.GetSystemInfo().ConfigureAwait(false);
+ var result = await _appHost.GetSystemInfo(CancellationToken.None).ConfigureAwait(false);
var publicInfo = new PublicSystemInfo
{