Add Timeout attribute to the API call.

Author: Amir Tocker

Cloudinary.Test/CloudinaryTest.cs

@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -72,7 +73,6 @@ public void Initialize()
             Assert.IsFalse(String.IsNullOrEmpty(m_account.ApiSecret));
 
             m_cloudinary = new Cloudinary(m_account);
-
             if (!String.IsNullOrWhiteSpace(Settings.Default.ApiBaseAddress))
                 m_cloudinary.Api.ApiBaseAddress = Settings.Default.ApiBaseAddress;
 
@@ -115,6 +115,44 @@ public void TestUploadLocalImage()
             Assert.AreEqual(expectedSign, uploadResult.Signature);
         }
 
+        [Test]
+        public void TestUploadLocalImageTimeout()
+        {
+            var code = WebExceptionStatus.Success;
+            var timeout = 11000;
+            var uploadParams = new ImageUploadParams()
+            {
+                File = new FileDescription(m_testImagePath)
+            };
+            var origAddr = m_cloudinary.Api.ApiBaseAddress;
+            Stopwatch stopWatch = new Stopwatch();
+            m_cloudinary.Api.ApiBaseAddress = "https://10.255.255.1";
+            m_cloudinary.Api.Timeout = timeout;
+            try
+            {
+                stopWatch.Start();
+                m_cloudinary.Upload(uploadParams);
+            }
+            catch (WebException e)
+            {
+                Console.WriteLine("Error {0}", e.Message);
+                code = e.Status;
+                stopWatch.Stop();
+
+            }
+            finally
+            {
+                m_cloudinary.Api.ApiBaseAddress = origAddr;
+                stopWatch.Stop();
+            }
+
+            //Assert.AreEqual(WebExceptionStatus.Timeout, code);
+            Console.WriteLine("Elapsed {0}", stopWatch.ElapsedMilliseconds);
+            Assert.LessOrEqual(timeout - 1000, stopWatch.ElapsedMilliseconds);
+            Assert.GreaterOrEqual(timeout + 1000, stopWatch.ElapsedMilliseconds);
+
+        }
+
         [Test]
         public void TestUploadLocalVideo()
         {

Cloudinary.Test/app.config

@@ -8,6 +8,9 @@
   <startup/>
   <applicationSettings>
     <Cloudinary.Test.Properties.Settings>
+      <setting name="ApiBaseAddress" serializeAs="String">
+        <value />
+      </setting>
       <setting name="CloudName" serializeAs="String">
         <value></value>
       </setting>
@@ -17,9 +20,6 @@
       <setting name="ApiSecret" serializeAs="String">
         <value></value>
       </setting>
-      <setting name="ApiBaseAddress" serializeAs="String">
-        <value />
-      </setting>
     </Cloudinary.Test.Properties.Settings>
   </applicationSettings>
 </configuration>

Cloudinary.sln

@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Web
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudinary", "Cloudinary\Cloudinary.csproj", "{6C0ACD6C-58BC-4571-A59D-EB752317C8A2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudinary.Test", "Cloudinary.Test\Cloudinary.Test.csproj", "{16C07542-4726-4AE7-9FDD-62DB823B449E}"
@@ -12,6 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D5DD0E
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DB3C0EFC-024A-4850-B201-375BC198F376}"
+	ProjectSection(SolutionItems) = preProject
+		sdk-test.testsettings = sdk-test.testsettings
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Cloudinary/Api.cs

@@ -34,6 +34,8 @@ public class Api : ISignProvider
         public string PrivateCdn;
         public string Suffix;
 
+        public int Timeout = 0;
+
         /// <summary>
         /// Sets whether to use the use chunked encoding. See http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1 for further info.
         /// Server must support HTTP/1.1 in order to use the chunked encoding.
@@ -304,10 +306,14 @@ public HttpWebResponse Call(HttpMethod method, string url, SortedDictionary<stri
             Console.WriteLine(String.Format("{0} REQUEST:", method));
             Console.WriteLine(url);
 #endif
-
+            
             HttpWebRequest request = HttpWebRequest.Create(url) as HttpWebRequest;
             request.Method = Enum.GetName(typeof(HttpMethod), method);
             request.UserAgent = USER_AGENT;
+            if (Timeout > 0)
+            {
+                request.Timeout = Timeout;
+            }
 
             if (method == HttpMethod.POST && parameters != null)
             {

Cloudinary/Cloudinary.csproj

@@ -117,6 +117,11 @@
     <Compile Include="Actions\RawUploadParams.cs" />
     <Compile Include="Actions\ImageUploadResult.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Include="StringDictionary.cs" />
     <Compile Include="Transforms\ImageTransform.cs" />
     <Compile Include="Transforms\VideoTransform.cs" />