michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add http client timeout

Browse Source
This commit is contained in:
Luke Pulverenti 2014-10-22 00:42:08 -04:00
parent 931bf29c3e
commit 1e7ac871db
1 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
View File

@ -123,7 +123,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
} }
request.Method = method; request.Method = method;
request.Timeout = 20000; request.Timeout = options.TimeoutMs;
if (!string.IsNullOrEmpty(options.Host)) if (!string.IsNullOrEmpty(options.Host))
{ {
@ -390,7 +390,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
if (!options.BufferContent) if (!options.BufferContent)
{ {
var response = await httpWebRequest.GetResponseAsync().ConfigureAwait(false); var response = await GetResponseAsync(httpWebRequest, TimeSpan.FromMilliseconds(options.TimeoutMs)).ConfigureAwait(false);
var httpResponse = (HttpWebResponse)response; var httpResponse = (HttpWebResponse)response;
@ -401,7 +401,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
return GetResponseInfo(httpResponse, httpResponse.GetResponseStream(), GetContentLength(httpResponse), httpResponse); return GetResponseInfo(httpResponse, httpResponse.GetResponseStream(), GetContentLength(httpResponse), httpResponse);
} }
using (var response = await httpWebRequest.GetResponseAsync().ConfigureAwait(false)) using (var response = await GetResponseAsync(httpWebRequest, TimeSpan.FromMilliseconds(options.TimeoutMs)).ConfigureAwait(false))
{ {
var httpResponse = (HttpWebResponse)response; var httpResponse = (HttpWebResponse)response;
@ -843,5 +843,47 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
{ {
return Post(url, postData, null, cancellationToken); return Post(url, postData, null, cancellationToken);
} }
private Task<WebResponse> GetResponseAsync(WebRequest request, TimeSpan timeout)
{
var taskCompletion = new TaskCompletionSource<WebResponse>();
Task<WebResponse> asyncTask = Task.Factory.FromAsync<WebResponse>(request.BeginGetResponse, request.EndGetResponse, null);
ThreadPool.RegisterWaitForSingleObject((asyncTask as IAsyncResult).AsyncWaitHandle, TimeoutCallback, request, timeout, true);
asyncTask.ContinueWith(task =>
{
taskCompletion.TrySetResult(task.Result);
}, TaskContinuationOptions.NotOnFaulted);
// Handle errors
asyncTask.ContinueWith(task =>
{
if (task.Exception != null)
{
taskCompletion.TrySetException(task.Exception);
}
else
{
taskCompletion.TrySetException(new List<Exception>());
}
}, TaskContinuationOptions.OnlyOnFaulted);
return taskCompletion.Task;
}
private static void TimeoutCallback(object state, bool timedOut)
{
if (timedOut)
{
WebRequest request = (WebRequest)state;
if (state != null)
{
request.Abort();
}
}
}
} }
} }