diff options
Diffstat (limited to 'MediaBrowser.Common.Implementations')
6 files changed, 30 insertions, 18 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 0bd61dbc2..37db80ee3 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -19,6 +19,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Net.Http; using System.Reflection; using System.Threading; using System.Threading.Tasks; @@ -272,7 +273,7 @@ namespace MediaBrowser.Common.Implementations RegisterSingleInstance(TaskManager); - HttpClient = new HttpClientManager.HttpClientManager(ApplicationPaths, Logger); + HttpClient = new HttpClientManager.HttpClientManager(ApplicationPaths, Logger, GetHttpMessageHandler); RegisterSingleInstance(HttpClient); NetworkManager = new NetworkManager(); @@ -286,6 +287,8 @@ namespace MediaBrowser.Common.Implementations }); } + protected abstract HttpMessageHandler GetHttpMessageHandler(bool enableHttpCompression); + /// <summary> /// Gets a list of types within an assembly /// This will handle situations that would normally throw an exception - such as a type within the assembly that depends on some other non-existant reference diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs index 82c385522..9eab2cdd8 100644 --- a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs +++ b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs @@ -9,8 +9,6 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using System.Net; -using System.Net.Cache; using System.Net.Http; using System.Text; using System.Threading; @@ -33,6 +31,10 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager /// </summary> private readonly IApplicationPaths _appPaths; + public delegate HttpMessageHandler GetHttpMessageHandler(bool enableHttpCompression); + + private readonly GetHttpMessageHandler _getHttpMessageHandler; + /// <summary> /// Initializes a new instance of the <see cref="HttpClientManager" /> class. /// </summary> @@ -43,7 +45,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager /// or /// logger /// </exception> - public HttpClientManager(IApplicationPaths appPaths, ILogger logger) + public HttpClientManager(IApplicationPaths appPaths, ILogger logger, GetHttpMessageHandler getHttpMessageHandler) { if (appPaths == null) { @@ -55,6 +57,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager } _logger = logger; + _getHttpMessageHandler = getHttpMessageHandler; _appPaths = appPaths; } @@ -85,15 +88,9 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager if (!_httpClients.TryGetValue(key, out client)) { - var handler = new WebRequestHandler - { - CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate), - AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None - }; - client = new HttpClientInfo { - HttpClient = new HttpClient(handler) + HttpClient = new HttpClient(_getHttpMessageHandler(enableHttpCompression)) { Timeout = TimeSpan.FromSeconds(20) } diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index a21a0790a..d0365fce4 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -54,7 +54,6 @@ <Reference Include="System.Management" /> <Reference Include="System.Net" /> <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs index 9a62f4ed3..d4b6c0b9e 100644 --- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs @@ -35,9 +35,15 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks /// <returns>IEnumerable{BaseTaskTrigger}.</returns> public IEnumerable<ITaskTrigger> GetDefaultTriggers() { - var trigger = new DailyTrigger { TimeOfDay = TimeSpan.FromHours(2) }; //2am - - return new[] { trigger }; + // Until we can vary these default triggers per server and MBT, we need something that makes sense for both + return new ITaskTrigger[] { + + // At startup + new StartupTrigger (), + + // Every so often + new IntervalTrigger { Interval = TimeSpan.FromHours(24)} + }; } /// <summary> diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs index bcead321d..15f955723 100644 --- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs @@ -35,9 +35,15 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks /// <returns>IEnumerable{BaseTaskTrigger}.</returns> public IEnumerable<ITaskTrigger> GetDefaultTriggers() { - var trigger = new DailyTrigger { TimeOfDay = TimeSpan.FromHours(2) }; //2am - - return new[] { trigger }; + // Until we can vary these default triggers per server and MBT, we need something that makes sense for both + return new ITaskTrigger[] { + + // At startup + new StartupTrigger (), + + // Every so often + new IntervalTrigger { Interval = TimeSpan.FromHours(24)} + }; } /// <summary> diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs index 0a134b5e5..33917125e 100644 --- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs @@ -48,6 +48,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks /// <returns>IEnumerable{BaseTaskTrigger}.</returns> public IEnumerable<ITaskTrigger> GetDefaultTriggers() { + // Until we can vary these default triggers per server and MBT, we need something that makes sense for both return new ITaskTrigger[] { // At startup |