Merge pull request #3 from shabicheng/dev

[modify] refine network operation & rename namespace

Author: shabicheng

SLSSDK/Client.cs

@@ -56,7 +56,6 @@ public static ServiceClient Create(ClientConfiguration configuration)
         public ServiceResponse Send(ServiceRequest request, ExecutionContext context)
         {
             Debug.Assert(request != null);
-
             SignRequest(request, context);
             ServiceResponse response = SendCore(request, context);
             HandleResponse(response, context.ResponseHandlers);

SLSSDK/Common/Communication/ServiceClient.cs

@@ -14,7 +14,7 @@
 using Aliyun.Api.LOG;
 using Aliyun.Api.LOG.Common.Utilities;
 using Aliyun.Api.LOG.Utilities;
-using System.Threading;
+
 namespace Aliyun.Api.LOG.Common.Communication
 {
     /// <summary>
@@ -235,14 +235,14 @@ private static ServiceResponse HandleException(WebException ex)
         protected override ServiceResponse SendCore(ServiceRequest serviceRequest,
                                                     ExecutionContext context)
         {
-            Random rnd = new Random();
             try
             {
-                HttpWebRequest request = HttpFactory.CreateWebRequest(serviceRequest, Configuration);
+                serviceRequest.HttpRequest = HttpFactory.CreateWebRequest(serviceRequest, Configuration);
 #if(!__UT_TEST_0EC173788C65DD08DA60575219707632__)
-                SetRequestContent(request, serviceRequest);
+                SetRequestContent(serviceRequest.HttpRequest, serviceRequest);
 #endif
-                return SendMethod(request);
+                
+                return SendMethod(serviceRequest.HttpRequest);
             }
             catch (WebException ex)
             {
@@ -268,25 +268,33 @@ private static void SetRequestContent(HttpWebRequest webRequest,
 
             // Write data to the request stream.
             long userSetContentLength = -1;
-            if (serviceRequest.Headers.ContainsKey(HttpHeaders.ContentLength))
+            if (serviceRequest.Headers.ContainsKey(Aliyun.Api.LOG.Common.Utilities.HttpHeaders.ContentLength))
             {
-                userSetContentLength = long.Parse(serviceRequest.Headers[HttpHeaders.ContentLength]);
+                userSetContentLength = long.Parse(serviceRequest.Headers[Aliyun.Api.LOG.Common.Utilities.HttpHeaders.ContentLength]);
             }
 
             long streamLength =  data.Length - data.Position;
             webRequest.ContentLength = (userSetContentLength >= 0 && userSetContentLength <= streamLength) ?
             userSetContentLength : streamLength;
 
-            //webRequest.
-            //webRequest.KeepAlive = true;
-            //webRequest.ReadWriteTimeout = 100000000;
-            //webRequest.ServicePoint.ConnectionLimit = 100000;
-            //webRequest.Timeout = Configuration
+            webRequest.KeepAlive = false;
+            webRequest.ServicePoint.ConnectionLeaseTimeout = 5000;
+            webRequest.ServicePoint.MaxIdleTime = 5000;
+            webRequest.ServicePoint.ConnectionLimit = 1000;
+            webRequest.ServicePoint.Expect100Continue = false;
+            // Generate GUID for connection group name, force close it when request is done.
+            webRequest.ConnectionGroupName = Guid.NewGuid().ToString();
+
             using (var requestStream = webRequest.GetRequestStream())
             {
                 data.WriteTo(requestStream, webRequest.ContentLength);
                 data.Seek(0, SeekOrigin.Begin);
+                requestStream.Flush();
+                requestStream.Close();
+                
             }
+            data.Close();
+            data.Dispose();
         }
 
         #endregion

SLSSDK/Common/Communication/ServiceClientImpl.cs

@@ -11,6 +11,7 @@
 using System.Text;
 
 using Aliyun.Api.LOG.Common.Utilities;
+using System.Net;
 
 namespace Aliyun.Api.LOG.Common.Communication
 {
@@ -38,7 +39,9 @@ internal class ServiceRequest : ServiceMessage, IDisposable
         /// Gets or sets the HTTP method.
         /// </summary>
         public HttpMethod Method { get; set; }
-        
+
+        public HttpWebRequest HttpRequest { get; set; }
+
         /// <summary>
         /// Gets the dictionary of the request parameters.
         /// </summary>
@@ -145,6 +148,14 @@ protected virtual void Dispose(bool disposing)
                     Content.Close();
                     Content = null;
                 }
+                if (HttpRequest != null)
+                {
+                    // force close connection group
+                    //Console.WriteLine(HttpRequest.ConnectionGroupName + "[]" + HttpRequest.ConnectionGroupName.Length.ToString() + "[]" + HttpRequest.ServicePoint.CurrentConnections.ToString());
+                    HttpRequest.ServicePoint.CloseConnectionGroup(HttpRequest.ConnectionGroupName);
+                    HttpRequest.Abort();
+                    HttpRequest = null;
+                }
                 _disposed = true;
             }   
         }

SLSSDK/Common/Communication/ServiceRequest.cs

@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Aliyun.Api.SLS.Response
+namespace Aliyun.Api.LOG.Response
 {
     public class BatchGetLogsResponse : LogResponse
     {

SLSSDK/Response/BatchGetLogsResponse.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Aliyun.Api.SLS.Response
+namespace Aliyun.Api.LOG.Response
 {
     public class ListShardsResponse: LogResponse
     {

SLSSDK/Response/ListShardsResponse.cs

@@ -3,7 +3,6 @@
 using Aliyun.Api.LOG.Request;
 using Aliyun.Api.LOG.Response;
 using Aliyun.Api.LOG.Utilities;
-using Aliyun.Api.SLS.Response;
 using System;
 using System.Collections.Generic;
 using System.IO;