Browse Source

Init fix

pull/262/head
Sebastian Stehle 8 years ago
parent
commit
13eb93fe38
  1. 6
      src/Squidex/Config/Domain/SystemExtensions.cs
  2. 7
      src/Squidex/Config/Orleans/SiloWrapper.cs
  3. 6
      src/Squidex/WebStartup.cs

6
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>();

7
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";

6
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();

Loading…
Cancel
Save