Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for request timeout #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for request timeout #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,5 @@ _Pvt_Extensions
.paket/paket.exe

# FAKE - F# Make
.fake/
.fake/
/.nuget/nuget.exe
6 changes: 6 additions & 0 deletions MessageBird/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ public class Client
{
private readonly IRestClient restClient;

public TimeSpan RequestTimeout
{
get { return restClient.RequestTimeout; }
set { restClient.RequestTimeout = value; }
}

private Client(IRestClient restClient)
{
this.restClient = restClient;
Expand Down
2 changes: 2 additions & 0 deletions MessageBird/Net/IRestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using MessageBird.Net.ProxyConfigurationInjector;
using MessageBird.Resources;
using System;

namespace MessageBird.Net
{
Expand All @@ -9,6 +10,7 @@ public interface IRestClient
string AccessKey { get; }
string Endpoint { get; }
IProxyConfigurationInjector ProxyConfigurationInjector { get; }
TimeSpan RequestTimeout { get; set; }

string ApiVersion { get; }
string ClientVersion { get; }
Expand Down
18 changes: 16 additions & 2 deletions MessageBird/Net/RestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public class RestClient : IRestClient

public IProxyConfigurationInjector ProxyConfigurationInjector { get; private set; }

public TimeSpan RequestTimeout { get; set; }

public string ClientVersion
{
get { return "1.0"; }
Expand All @@ -35,15 +37,26 @@ public string UserAgent
get { return string.Format("MessageBird/ApiClient/{0} DotNet/{1}", ApiVersion, ClientVersion); }
}

public RestClient(string endpoint, string accessKey, IProxyConfigurationInjector proxyConfigurationInjector)
public RestClient(string endpoint, string accessKey, IProxyConfigurationInjector proxyConfigurationInjector, TimeSpan requestTimeout)
{
Endpoint = endpoint;
AccessKey = accessKey;
ProxyConfigurationInjector = proxyConfigurationInjector;
RequestTimeout = requestTimeout;
}

public RestClient(string endpoint, string accessKey, IProxyConfigurationInjector proxyConfigurationInjector)
: this(endpoint, accessKey, proxyConfigurationInjector, TimeSpan.FromSeconds(60))
{
}

public RestClient(string accessKey, IProxyConfigurationInjector proxyConfigurationInjector, TimeSpan requestTimeout)
: this(HttpsRestMessagebirdComEndpoint, accessKey, proxyConfigurationInjector, requestTimeout)
{
}

public RestClient(string accessKey, IProxyConfigurationInjector proxyConfigurationInjector)
: this(HttpsRestMessagebirdComEndpoint, accessKey, proxyConfigurationInjector)
: this(accessKey, proxyConfigurationInjector, TimeSpan.FromSeconds(60))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be great to have a TimeSpan DefaultTimeout field to use here - then we can reuse that below when actually setting the timeout in PrepareRequest. What do you think?

{
}

Expand Down Expand Up @@ -137,6 +150,7 @@ private HttpWebRequest PrepareRequest(string requestUriString, string method)
request.Accept = ApplicationJsonContentType;
request.ContentType = ApplicationJsonContentType;
request.Method = method;
request.Timeout = RequestTimeout > TimeSpan.Zero ? (int)RequestTimeout.TotalMilliseconds : 60000;

WebHeaderCollection headers = request.Headers;
headers.Add("Authorization", String.Format("AccessKey {0}", AccessKey));
Expand Down
15 changes: 9 additions & 6 deletions csharp-rest-client.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2015
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MessageBird", "MessageBird\MessageBird.csproj", "{C49CD3F8-BCDB-4BA9-B817-6A6C65452510}"
EndProject
Expand All @@ -12,14 +12,11 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{25EE7FD1-9433-4EEE-99F3-A8344DF7AC6F}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\nuget.exe = .nuget\nuget.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Global
GlobalSection(CodealikeProperties) = postSolution
SolutionGuid = 18c1a31e-4063-4902-9aad-882f3cfab5d4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand All @@ -41,4 +38,10 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C59D1B5F-9D00-477F-BD73-FC2D4B0A3F0A}
EndGlobalSection
GlobalSection(CodealikeProperties) = postSolution
SolutionGuid = 18c1a31e-4063-4902-9aad-882f3cfab5d4
EndGlobalSection
EndGlobal