From 13eb93fe384fe0e10102cf9e47a9fbb1804e9a57 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <mail2stehle@gmail.com>
Date: Sat, 24 Mar 2018 17:25:28 +0100
Subject: [PATCH] Init fix

---
 src/Squidex/Config/Domain/SystemExtensions.cs | 6 +++---
 src/Squidex/Config/Orleans/SiloWrapper.cs     | 7 +++++++
 src/Squidex/WebStartup.cs                     | 6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Squidex/Config/Domain/SystemExtensions.cs b/src/Squidex/Config/Domain/SystemExtensions.cs
index bd2b177c8..29e985d3e 100644
--- a/src/Squidex/Config/Domain/SystemExtensions.cs
+++ b/src/Squidex/Config/Domain/SystemExtensions.cs
@@ -15,7 +15,7 @@ namespace Squidex.Config.Domain
 {
     public static class SystemExtensions
     {
-        public static void InitializeAll(this IServiceProvider services)
+        public static void RunInitialization(this IServiceProvider services)
         {
             var systems = services.GetRequiredService<IEnumerable<IInitializable>>();
 
@@ -25,7 +25,7 @@ namespace Squidex.Config.Domain
             }
         }
 
-        public static void RunAll(this IServiceProvider services)
+        public static void RunRunnables(this IServiceProvider services)
         {
             var systems = services.GetRequiredService<IEnumerable<IRunnable>>();
 
@@ -35,7 +35,7 @@ namespace Squidex.Config.Domain
             }
         }
 
-        public static void Migrate(this IServiceProvider services)
+        public static void RunMigrate(this IServiceProvider services)
         {
             var migrator = services.GetRequiredService<Migrator>();
 
diff --git a/src/Squidex/Config/Orleans/SiloWrapper.cs b/src/Squidex/Config/Orleans/SiloWrapper.cs
index 75991185c..3b6c92dbe 100644
--- a/src/Squidex/Config/Orleans/SiloWrapper.cs
+++ b/src/Squidex/Config/Orleans/SiloWrapper.cs
@@ -24,6 +24,7 @@ using Squidex.Infrastructure.EventSourcing.Grains;
 using Squidex.Infrastructure.Log;
 using Squidex.Infrastructure.Log.Adapter;
 using Squidex.Infrastructure.Orleans;
+using Squidex.Infrastructure.Tasks;
 
 namespace Squidex.Config.Orleans
 {
@@ -60,6 +61,12 @@ namespace Squidex.Config.Orleans
                     .AddStartupTask<Bootstrap<IContentSchedulerGrain>>()
                     .AddStartupTask<Bootstrap<IEventConsumerManagerGrain>>()
                     .AddStartupTask<Bootstrap<IRuleDequeuerGrain>>()
+                    .AddStartupTask((services, ct) =>
+                    {
+                        services.RunInitialization();
+
+                        return TaskHelper.Done;
+                    })
                     .Configure<ClusterOptions>(options =>
                     {
                         options.ClusterId = "squidex";
diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs
index 73b2ffb50..7b2188fec 100644
--- a/src/Squidex/WebStartup.cs
+++ b/src/Squidex/WebStartup.cs
@@ -42,9 +42,9 @@ namespace Squidex
         public void Configure(IApplicationBuilder app)
         {
             app.ApplicationServices.LogConfiguration();
-            app.ApplicationServices.InitializeAll();
-            app.ApplicationServices.Migrate();
-            app.ApplicationServices.RunAll();
+            app.ApplicationServices.RunInitialization();
+            app.ApplicationServices.RunMigrate();
+            app.ApplicationServices.RunRunnables();
 
             app.UseMyCors();
             app.UseMyForwardingRules();