From 4c405f0f2970c1b7c570b383e126c862175a4fce Mon Sep 17 00:00:00 2001
From: Tom Gardham-Pallister <tom.pallister@fourth.com>
Date: Thu, 3 May 2018 23:00:40 +0100
Subject: [PATCH] revert

---
 .../LoadBalancer/LoadBalancers/CookieStickySessions.cs      | 4 ++--
 .../LoadBalancer/LoadBalancers/LoadBalancerFactory.cs       | 3 +--
 .../LoadBalancer/CookieStickySessionsTests.cs               | 6 +-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs b/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs
index 6a81aedd..49af2079 100644
--- a/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs
+++ b/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs
@@ -19,7 +19,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers
         private readonly Timer _timer;
         private bool _expiring;
 
-        public CookieStickySessions(ILoadBalancer loadBalancer, string key, int keyExpiryInMs, int expiryPeriodInMs)
+        public CookieStickySessions(ILoadBalancer loadBalancer, string key, int keyExpiryInMs)
         {
             _key = key;
             _keyExpiryInMs = keyExpiryInMs;
@@ -37,7 +37,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers
                 Expire();
 
                 _expiring = false;
-            }, null, 0, expiryPeriodInMs);
+            }, null, 0, 50);
         }
 
         public void Dispose()
diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerFactory.cs b/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerFactory.cs
index 47b4537d..1f0ecc72 100644
--- a/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerFactory.cs
+++ b/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerFactory.cs
@@ -7,7 +7,6 @@ namespace Ocelot.LoadBalancer.LoadBalancers
     public class LoadBalancerFactory : ILoadBalancerFactory
     {
         private readonly IServiceDiscoveryProviderFactory _serviceProviderFactory;
-        private const int ExpiryPeriodInMs = 50;
 
         public LoadBalancerFactory(IServiceDiscoveryProviderFactory serviceProviderFactory)
         {
@@ -26,7 +25,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers
                     return new LeastConnection(async () => await serviceProvider.Get(), reRoute.ServiceName);
                 case nameof(CookieStickySessions):
                     var loadBalancer = new RoundRobin(async () => await serviceProvider.Get());
-                    return new CookieStickySessions(loadBalancer, reRoute.LoadBalancerOptions.Key, reRoute.LoadBalancerOptions.ExpiryInMs, ExpiryPeriodInMs);
+                    return new CookieStickySessions(loadBalancer, reRoute.LoadBalancerOptions.Key, reRoute.LoadBalancerOptions.ExpiryInMs);
                 default:
                     return new NoLoadBalancer(await serviceProvider.Get());
             }
diff --git a/test/Ocelot.UnitTests/LoadBalancer/CookieStickySessionsTests.cs b/test/Ocelot.UnitTests/LoadBalancer/CookieStickySessionsTests.cs
index 9ef647c6..ff908123 100644
--- a/test/Ocelot.UnitTests/LoadBalancer/CookieStickySessionsTests.cs
+++ b/test/Ocelot.UnitTests/LoadBalancer/CookieStickySessionsTests.cs
@@ -29,7 +29,7 @@ namespace Ocelot.UnitTests.LoadBalancer
         {
             _loadBalancer = new Mock<ILoadBalancer>();
             _defaultExpiryInMs = 100;
-            _stickySessions = new CookieStickySessions(_loadBalancer.Object, "sessionid", _defaultExpiryInMs, 1);
+            _stickySessions = new CookieStickySessions(_loadBalancer.Object, "sessionid", _defaultExpiryInMs);
             _downstreamContext = new DownstreamContext(new DefaultHttpContext());
         }
 
@@ -73,8 +73,6 @@ namespace Ocelot.UnitTests.LoadBalancer
         [Fact]
         public void should_expire_sticky_session()
         {
-            _stickySessions = new CookieStickySessions(_loadBalancer.Object, "sessionid", _defaultExpiryInMs, 1);
-
             this.Given(_ => GivenTheLoadBalancerReturnsSequence())
                 .When(_ => WhenTheStickySessionExpires())
                 .Then(_ => ThenANewHostAndPortIsReturned())
@@ -84,8 +82,6 @@ namespace Ocelot.UnitTests.LoadBalancer
         [Fact]
         public void should_refresh_sticky_session()
         {
-            _stickySessions = new CookieStickySessions(_loadBalancer.Object, "sessionid", _defaultExpiryInMs, 50);
-
             this.Given(_ => GivenTheLoadBalancerReturnsSequence())
                 .When(_ => WhenIMakeRequestsToKeepRefreshingTheSession())
                 .Then(_ => ThenTheSessionIsRefreshed())