Merge pull request #2473 from MediaBrowser/dev

Dev

3 files changed, 5 insertions, 8 deletions

diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index c65289e13..6fcdab874 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -767,8 +767,6 @@ namespace Emby.Server.Implementations.HttpServer
         {
             if (_disposed) return;
 
-            Dispose();
-
             lock (_disposeLock)
             {
                 if (_disposed) return;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index e30280967..b139c68f4 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1477,12 +1477,7 @@ namespace Emby.Server.Implementations.LiveTv
         private DateTime _lastRecordingRefreshTime;
         private async Task RefreshRecordings(CancellationToken cancellationToken)
         {
-            const int cacheMinutes = 3;
-
-            if ((DateTime.UtcNow - _lastRecordingRefreshTime).TotalMinutes < cacheMinutes)
-            {
-                return;
-            }
+            const int cacheMinutes = 2;
 
             await _refreshRecordingsLock.WaitAsync(cancellationToken).ConfigureAwait(false);
 
diff --git a/Emby.Server.Implementations/ServerManager/ServerManager.cs b/Emby.Server.Implementations/ServerManager/ServerManager.cs
index f7e4c0ce2..4c9228e54 100644
--- a/Emby.Server.Implementations/ServerManager/ServerManager.cs
+++ b/Emby.Server.Implementations/ServerManager/ServerManager.cs
@@ -303,6 +303,7 @@ namespace Emby.Server.Implementations.ServerManager
         /// </summary>
         private void DisposeHttpServer()
         {
+            _logger.Info("Disposing web socket connections");
             foreach (var socket in _webSocketConnections)
             {
                 // Dispose the connection
@@ -314,6 +315,9 @@ namespace Emby.Server.Implementations.ServerManager
             if (HttpServer != null)
             {
                 HttpServer.WebSocketConnected -= HttpServer_WebSocketConnected;
+
+                _logger.Info("Disposing http server");
+
                 HttpServer.Dispose();
             }
         }