aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-12-05 13:37:55 -0500
committerGitHub <noreply@github.com>2017-12-05 13:37:55 -0500
commitc32d8656382a0eacb301692e0084377fc433ae9b (patch)
tree121dd382bf71a9b5c96e00771c0ba18a7d28ab87 /MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
parente7ffdf3fbdae7d4ec76a0a4e0e37792b079c56e5 (diff)
parentb3fbdde04305a0406b5322ec6947f8a30ddc12af (diff)
Merge pull request #3055 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Api/System/ActivityLogWebSocketListener.cs')
-rw-r--r--MediaBrowser.Api/System/ActivityLogWebSocketListener.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
index 793f74571..f9cac7389 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>());
}