Corrected Timeout code

soitgoes · Feb 12, 2016 · 3484c44 · 3484c44
1 parent 60d25ca
commit 3484c44
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/LoveSeat/Support/CouchBase.cs b/LoveSeat/Support/CouchBase.cs
@@ -10,7 +10,7 @@ public abstract class CouchBase
         protected readonly AuthenticationType authType;
         protected string baseUri;
         private TtlDictionary<string, Cookie> cookiestore = new TtlDictionary<string, Cookie>();
-        private int? timeout;
+        protected int? timeout;
 
         protected CouchBase()
         {

diff --git a/LoveSeat/Support/CouchRequest.cs b/LoveSeat/Support/CouchRequest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -41,7 +42,6 @@ public CouchRequest(string uri, Cookie authCookie, string eTag)
             request.KeepAlive = true;
             if (authCookie != null)
                 request.Headers.Add("Cookie", "AuthSession=" + authCookie.Value);
-            request.Timeout = 10000;
         }
 
         /// <summary>
@@ -74,7 +74,6 @@ public CouchRequest(string uri, string username, string password)
             request.Headers.Add("Accept-Language", "en-us");
             request.ContentType = "application/json";
             request.KeepAlive = true;
-            request.Timeout = 10000;
         }
 
 
@@ -152,9 +151,16 @@ public CouchRequest Json()
             return this;
         }
 
-        public CouchRequest Timeout(int timeoutMs)
+        public CouchRequest Timeout(int? timeoutMs)
         {
-            request.Timeout = timeoutMs;
+            if (timeoutMs.HasValue)
+            {
+                request.Timeout = timeoutMs.Value;
+            }
+            else
+            {
+                request.Timeout = (int)TimeSpan.FromHours(1).TotalMilliseconds;
+            }
             return this;
         }
 
@@ -193,7 +199,7 @@ public CouchResponse GetCouchResponse()
             {
                 if (failedAuth == true)
                 {
-                    throw;
+                    throw webEx;
                 }
                 var response = (HttpWebResponse)webEx.Response;
                 if (response == null)