Fix the purge mechanism

src/EventStore.Core/ClusterVNodeStartup.cs

@@ -114,7 +114,8 @@ public void Configure(IApplicationBuilder app) {
 			_configureNode(app);
 
 			var internalDispatcher = new InternalDispatcherEndpoint(_mainQueue, _httpMessageHandler);
-			_mainBus.Subscribe(internalDispatcher);
+			_mainBus.Subscribe<SystemMessage.SystemInit>(internalDispatcher);
+			_mainBus.Subscribe<HttpMessage.PurgeTimedOutRequests>(internalDispatcher);
 
 			app = app.Map("/health", _statusCheck.Configure)
 				// AuthenticationMiddleware uses _httpAuthenticationProviders and assigns

src/EventStore.Core/Services/Transport/Http/InternalDispatcherEndpoint.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
-using EventStore.Common.Log;
 using EventStore.Core.Bus;
 using EventStore.Core.Messages;
 using EventStore.Core.Messaging;
@@ -13,25 +11,34 @@
 
 namespace EventStore.Core.Services.Transport.Http
 {
-	public class InternalDispatcherEndpoint : IHandle<HttpMessage.PurgeTimedOutRequests> {
+	public class InternalDispatcherEndpoint :
+		IHandle<SystemMessage.SystemInit>,
+		IHandle<HttpMessage.PurgeTimedOutRequests> {
+
 		private static readonly ILogger Log = Serilog.Log.ForContext<AuthorizationMiddleware>();
-		private readonly IPublisher _inputBus;
+		private readonly IPublisher _output;
 		private readonly MultiQueuedHandler _requestsMultiHandler;
 		private static readonly TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
-		private readonly IEnvelope _publishEnvelope;
-		public InternalDispatcherEndpoint(IPublisher inputBus, MultiQueuedHandler requestsMultiHandler) {
+		private readonly Message _schedulePurge;
 
-			_inputBus = inputBus;
+		public InternalDispatcherEndpoint(IPublisher output, MultiQueuedHandler requestsMultiHandler) {
+			_output = output;
 			_requestsMultiHandler = requestsMultiHandler;
-			_publishEnvelope = new PublishEnvelope(inputBus);
+
+			_schedulePurge = TimerMessage.Schedule.Create(
+				UpdateInterval,
+				new PublishEnvelope(output),
+				new HttpMessage.PurgeTimedOutRequests());
+
+		}
+
+		public void Handle(SystemMessage.SystemInit _) {
+			_output.Publish(_schedulePurge);
 		}
+
 		public void Handle(HttpMessage.PurgeTimedOutRequests message) {
-
 			_requestsMultiHandler.PublishToAll(message);
-
-			_inputBus.Publish(
-				TimerMessage.Schedule.Create(
-					UpdateInterval, _publishEnvelope, message));
+			_output.Publish(_schedulePurge);
 		}
 
 		public Task InvokeAsync(HttpContext context) {

src/EventStore.Core/Services/Transport/Http/KestrelHttpService.cs

@@ -20,7 +20,7 @@ namespace EventStore.Core.Services.Transport.Http {
 	public class KestrelHttpService : IHttpService,
 		IHandle<SystemMessage.SystemInit>,
 		IHandle<SystemMessage.BecomeShuttingDown> {
-		private static readonly TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+
 		private static readonly ILogger Log = Serilog.Log.ForContext<KestrelHttpService>();
 
 		public ServiceAccessibility Accessibility => _accessibility;
@@ -101,6 +101,7 @@ public void RegisterAction(ControllerAction action, Action<HttpEntityManager, Ur
 		public static void CreateAndSubscribePipeline(ISubscriber bus) {
 			var requestProcessor = new AuthenticatedHttpRequestProcessor();
 			bus.Subscribe<AuthenticatedHttpRequestMessage>(requestProcessor);
+			bus.Subscribe<HttpMessage.PurgeTimedOutRequests>(requestProcessor);
 		}
 	}
 }