Skip to content

Commit 5c3f894

Browse files
committed
Increased timeout to 300 sec inline with the ALM
log get call duration
1 parent d1e91a7 commit 5c3f894

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

Rally.RestApi/CookieAwareWebClient.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ public CookieAwareWebClient(CookieContainer cookies = null)
1919
protected override WebRequest GetWebRequest(Uri address)
2020
{
2121
WebRequest request = base.GetWebRequest(address);
22+
2223
HttpWebRequest webRequest = request as HttpWebRequest;
2324
if (webRequest != null)
2425
{
2526
webRequest.CookieContainer = cookies;
2627
}
28+
29+
request.Timeout = 300000;
30+
2731
return request;
2832
}
2933
}

Rally.RestApi/HttpService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public string Post(Uri target, string data, IDictionary<string, string> headers
9494
public string Get(Uri target, IDictionary<string, string> headers = null)
9595
{
9696
String response = "<No response>";
97+
DateTime startTime = DateTime.Now;
9798
try
9899
{
99100
using (var webClient = GetWebClient(headers))
@@ -104,7 +105,7 @@ public string Get(Uri target, IDictionary<string, string> headers = null)
104105
}
105106
finally
106107
{
107-
Trace.TraceInformation("Rally.RestApi Get: {0}\r\nResponse:\r\n{1}", target.ToString(), response);
108+
Trace.TraceInformation("Rally.RestApi Get({0}): {1}\r\nResponse:\r\n{2}", DateTime.Now.Subtract(startTime).ToString(), target.ToString(), response);
108109
}
109110
}
110111

Rally.RestApi/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.15.0")]
35-
[assembly: AssemblyFileVersion("1.0.15.0")]
34+
[assembly: AssemblyVersion("1.0.16.0")]
35+
[assembly: AssemblyFileVersion("1.0.16.0")]
3636

3737
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Rally.RestApi.Test")]

Rally.RestApi/RallyRestApi.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public QueryResult Query(Request request)
286286
var response = MakeRequest(GetFullyQualifiedUri(request.RequestUrl));
287287
var result = new QueryResult(response["QueryResult"]);
288288
int maxResultsAllowed = Math.Min(request.Limit, result.TotalResultCount);
289-
var alreadyDownloadedItems = request.Start - 1 + request.PageSize;
289+
int alreadyDownloadedItems = request.Start - 1 + request.PageSize;
290290
var subsequentQueries = new List<Request>();
291291

292292
while ((maxResultsAllowed - alreadyDownloadedItems) > 0)
@@ -302,6 +302,8 @@ public QueryResult Query(Request request)
302302
alreadyDownloadedItems = request.Start - 1 + request.PageSize;
303303
}
304304

305+
Trace.TraceInformation("The number of threaded requests is : {0}", subsequentQueries.Count);
306+
305307
var resultDictionary = new Dictionary<int, QueryResult>();
306308
Parallel.ForEach(subsequentQueries, new ParallelOptions { MaxDegreeOfParallelism = MAX_THREADS_ALLOWED }, request1 =>
307309
{

0 commit comments

Comments
 (0)