Merge pull request #464 from justcoding121/master

Remove polly

Author: justcoding121

README.md

@@ -36,7 +36,7 @@ Install by [nuget](https://www.nuget.org/packages/Titanium.Web.Proxy)
 
 For beta releases on [beta branch](https://github.com/justcoding121/Titanium-Web-Proxy/tree/beta)
 
-    Install-Package Titanium.Web.Proxy -Pre
+    Install-Package Titanium.Web.Proxy
 
 For stable releases on [stable branch](https://github.com/justcoding121/Titanium-Web-Proxy/tree/stable)
 

Titanium.Web.Proxy/Network/RetryPolicy.cs

@@ -1,5 +1,4 @@
-using Polly;
-using System;
+using System;
 using System.Threading.Tasks;
 using Titanium.Web.Proxy.Network.Tcp;
 
@@ -11,14 +10,11 @@ internal class RetryPolicy<T> where T : Exception
         private readonly TcpConnectionFactory tcpConnectionFactory;
 
         private TcpServerConnection currentConnection;
-        private Policy policy;
 
         internal RetryPolicy(int retries, TcpConnectionFactory tcpConnectionFactory)
         {
             this.retries = retries;
             this.tcpConnectionFactory = tcpConnectionFactory;
-
-            policy = getRetryPolicy();
         }
 
         /// <summary>
@@ -32,38 +28,42 @@ internal async Task<RetryResult> ExecuteAsync(Func<TcpServerConnection, Task<boo
             Func<Task<TcpServerConnection>> generator, TcpServerConnection initialConnection)
         {
             currentConnection = initialConnection;
-            Exception exception = null;
             bool @continue = true;
+            Exception exception = null;
 
-            try
+            var attempts = retries;
+            while (attempts >= 0)
             {
-                //retry on error with polly policy
-                //do not use polly context to store connection; it does not save states b/w attempts
-                await policy.ExecuteAsync(async () =>
+                
+                try
                 {
                     //setup connection
                     currentConnection = currentConnection as TcpServerConnection ??
                                       await generator();
                     //try
                     @continue = await action(currentConnection);
 
-                });
+                }
+                catch (T ex)
+                {
+                    exception = ex;
+                    await onRetry(ex);
+                }
+
+                if(exception == null)
+                {
+                    break;
+                }
+
+                exception = null;
+                attempts--;
             }
-            catch (Exception e) { exception = e; }
 
             return new RetryResult(currentConnection, exception, @continue);
         }
 
-        //get the policy
-        private Policy getRetryPolicy()
-        {
-            return Policy.Handle<T>()
-                    .RetryAsync(retries,
-                        onRetryAsync: onRetry);
-        }
-
         //before retry clear connection
-        private async Task onRetry(Exception ex, int attempt)
+        private async Task onRetry(Exception ex)
         {
             if (currentConnection != null)
             {

Titanium.Web.Proxy/ResponseHandler.cs

@@ -12,7 +12,7 @@ namespace Titanium.Web.Proxy
     public partial class ProxyServer
     {
         /// <summary>
-        ///     Called asynchronously when a request was successfully and we received the response.
+        ///     Called asynchronously when a request was successfull and we received the response.
         /// </summary>
         /// <param name="args">The session event arguments.</param>
         /// <returns> The task.</returns>

Titanium.Web.Proxy/Titanium.Web.Proxy.csproj

@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Polly" Version="6.0.1" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.2" />
     <PackageReference Include="StreamExtended" Version="1.0.179" />
   </ItemGroup>

Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec

@@ -16,7 +16,6 @@
     <dependencies>
       <dependency id="StreamExtended" version="1.0.179" />
       <dependency id="Portable.BouncyCastle" version="1.8.2" />
-      <dependency id="Polly" version="6.0.1"/>
     </dependencies>
   </metadata>
   <files>

Titanium.Web.Proxy/packages.config

@@ -3,5 +3,4 @@
 <packages>
   <package id="Portable.BouncyCastle" version="1.8.2" targetFramework="net45" />
   <package id="StreamExtended" version="1.0.179" targetFramework="net45" />
-  <package id="Polly" version="6.0.1" targetFramework="net45" />
 </packages>

docs/api/Titanium.Web.Proxy.EventArguments.AsyncEventHandler-1.html

@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width">
     <meta name="title" content="Delegate AsyncEventHandler&lt;TEventArgs&gt;
    | Titanium Web Proxy ">
-    <meta name="generator" content="docfx 2.36.1.0">
+    <meta name="generator" content="docfx 2.36.2.0">
 
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" href="../styles/docfx.vendor.css">

docs/api/Titanium.Web.Proxy.EventArguments.BeforeSslAuthenticateEventArgs.html

@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width">
     <meta name="title" content="Class BeforeSslAuthenticateEventArgs
    | Titanium Web Proxy ">
-    <meta name="generator" content="docfx 2.36.1.0">
+    <meta name="generator" content="docfx 2.36.2.0">
 
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" href="../styles/docfx.vendor.css">

docs/api/Titanium.Web.Proxy.EventArguments.CertificateSelectionEventArgs.html

@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width">
     <meta name="title" content="Class CertificateSelectionEventArgs
    | Titanium Web Proxy ">
-    <meta name="generator" content="docfx 2.36.1.0">
+    <meta name="generator" content="docfx 2.36.2.0">
 
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" href="../styles/docfx.vendor.css">

docs/api/Titanium.Web.Proxy.EventArguments.CertificateValidationEventArgs.html

@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width">
     <meta name="title" content="Class CertificateValidationEventArgs
    | Titanium Web Proxy ">
-    <meta name="generator" content="docfx 2.36.1.0">
+    <meta name="generator" content="docfx 2.36.2.0">
 
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" href="../styles/docfx.vendor.css">