ThreeMammals#529 removed raft (ThreeMammals#543)

src/Ocelot/Configuration/FileConfigurationController.cs

@@ -4,11 +4,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Ocelot.Configuration.File;
 using Ocelot.Configuration.Setter;
-using Ocelot.Raft;
 
 namespace Ocelot.Configuration
 {
-    using Rafty.Concensus.Node;
     using Repository;
 
     [Authorize]
@@ -44,20 +42,6 @@ public async Task<IActionResult> Post([FromBody]FileConfiguration fileConfigurat
         {
             try
             {
-                //todo - this code is a bit shit sort it out..
-                var test = _provider.GetService(typeof(INode));
-                if (test != null)
-                {
-                    var node = (INode)test;
-                    var result = await node.Accept(new UpdateFileConfiguration(fileConfiguration));
-                    if (result.GetType() == typeof(Rafty.Infrastructure.ErrorResponse<UpdateFileConfiguration>))
-                    {
-                        return new BadRequestObjectResult("There was a problem. This error message sucks raise an issue in GitHub.");
-                    }
-
-                    return new OkObjectResult(result.Command.Configuration);
-                }
-
                 var response = await _setter.Set(fileConfiguration);
 
                 if (response.IsError)

src/Ocelot/DependencyInjection/IOcelotAdministrationBuilder.cs

@@ -2,6 +2,5 @@ namespace Ocelot.DependencyInjection
 {
     public interface IOcelotAdministrationBuilder
     {
-        IOcelotAdministrationBuilder AddRafty();
     }
 }

src/Ocelot/DependencyInjection/OcelotAdministrationBuilder.cs

@@ -1,36 +1,17 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Ocelot.Raft;
-using Rafty.Concensus;
-using Rafty.FiniteStateMachine;
-using Rafty.Infrastructure;
-using Rafty.Log;
 
 namespace Ocelot.DependencyInjection
 {
-    using Rafty.Concensus.Node;
-
     public class OcelotAdministrationBuilder : IOcelotAdministrationBuilder
     {
-        private readonly IServiceCollection _services;
-        private readonly IConfiguration _configurationRoot;
-        
+        private IServiceCollection Services { get; }
+        private IConfiguration ConfigurationRoot { get; }
+
         public OcelotAdministrationBuilder(IServiceCollection services, IConfiguration configurationRoot)
         {
-            _configurationRoot = configurationRoot;
-            _services = services;    
-        }
-
-        public IOcelotAdministrationBuilder AddRafty()
-        {
-            var settings = new InMemorySettings(4000, 6000, 100, 10000);
-            _services.AddSingleton<ILog, SqlLiteLog>();
-            _services.AddSingleton<IFiniteStateMachine, OcelotFiniteStateMachine>();
-            _services.AddSingleton<ISettings>(settings);
-            _services.AddSingleton<IPeersProvider, FilePeersProvider>();
-            _services.AddSingleton<INode, Node>();
-            _services.Configure<FilePeers>(_configurationRoot);
-            return this;
+            ConfigurationRoot = configurationRoot;
+            Services = services;    
         }
     }
 }

src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs

@@ -15,10 +15,7 @@
     using Ocelot.Configuration.Setter;
     using Ocelot.Responses;
     using Ocelot.Logging;
-    using Rafty.Concensus;
-    using Rafty.Infrastructure;
     using Ocelot.Middleware.Pipeline;
-    using Rafty.Concensus.Node;
     using Microsoft.Extensions.DependencyInjection;
 
     public static class OcelotMiddlewareExtensions
@@ -42,11 +39,6 @@ public static async Task<IApplicationBuilder> UseOcelot(this IApplicationBuilder
 
             CreateAdministrationArea(builder, configuration);
 
-            if (UsingRafty(builder))
-            {
-                SetUpRafty(builder);
-            }
-
             ConfigureDiagnosticListener(builder);
 
             return CreateOcelotPipeline(builder, pipelineConfiguration);
@@ -77,26 +69,6 @@ rest of asp.net..
             return builder;
         }
 
-        private static bool UsingRafty(IApplicationBuilder builder)
-        {
-            var node = builder.ApplicationServices.GetService<INode>();
-            if (node != null)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private static void SetUpRafty(IApplicationBuilder builder)
-        {
-            var applicationLifetime = builder.ApplicationServices.GetService<IApplicationLifetime>();
-            applicationLifetime.ApplicationStopping.Register(() => OnShutdown(builder));
-            var node = builder.ApplicationServices.GetService<INode>();
-            var nodeId = builder.ApplicationServices.GetService<NodeId>();
-            node.Start(nodeId);
-        }
-
         private static async Task<IInternalConfiguration> CreateConfiguration(IApplicationBuilder builder)
         {
             // make configuration from file system?
@@ -207,11 +179,5 @@ private static void ConfigureDiagnosticListener(IApplicationBuilder builder)
             var diagnosticListener = builder.ApplicationServices.GetService<DiagnosticListener>();
             diagnosticListener.SubscribeWithAdapter(listener);
         }
-
-        private static void OnShutdown(IApplicationBuilder app)
-        {
-            var node = app.ApplicationServices.GetService<INode>();
-            node.Stop();
-        }
     }
 }

src/Ocelot/Ocelot.csproj

@@ -48,6 +48,5 @@
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
     <PackageReference Include="Polly" Version="6.0.1" />
     <PackageReference Include="IdentityServer4" Version="2.2.0" />
-    <PackageReference Include="Rafty" Version="0.4.4" />
   </ItemGroup>
 </Project>