diff --git a/src/Squidex.Infrastructure/Orleans/InitializerStartup.cs b/src/Squidex.Infrastructure/Orleans/InitializerStartup.cs index f5e834aa7..848afcadf 100644 --- a/src/Squidex.Infrastructure/Orleans/InitializerStartup.cs +++ b/src/Squidex.Infrastructure/Orleans/InitializerStartup.cs @@ -9,25 +9,31 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Orleans.Runtime; +using Squidex.Infrastructure.Log; namespace Squidex.Infrastructure.Orleans { public sealed class InitializerStartup : IStartupTask { - private readonly IEnumerable initializables; + private readonly IEnumerable targets; + private readonly ISemanticLog log; - public InitializerStartup(IEnumerable initializables) + public InitializerStartup(IEnumerable targets, ISemanticLog log) { - Guard.NotNull(initializables, nameof(initializables)); + Guard.NotNull(targets, nameof(targets)); - this.initializables = initializables; + this.targets = targets; + + this.log = log; } public async Task Execute(CancellationToken cancellationToken) { - foreach (var initializable in initializables) + foreach (var target in targets) { - await initializable.InitializeAsync(cancellationToken); + await target.InitializeAsync(cancellationToken); + + log?.LogInformation(w => w.WriteProperty("siloInitializedSystem", target.GetType().Name)); } } } diff --git a/src/Squidex/Config/Domain/SystemExtensions.cs b/src/Squidex/Config/Domain/SystemExtensions.cs index 5432416cd..87cb4654e 100644 --- a/src/Squidex/Config/Domain/SystemExtensions.cs +++ b/src/Squidex/Config/Domain/SystemExtensions.cs @@ -10,6 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Migrations; namespace Squidex.Config.Domain @@ -19,10 +20,13 @@ namespace Squidex.Config.Domain public sealed class InitializeHostedService : IHostedService { private readonly IEnumerable targets; + private readonly ISemanticLog log; - public InitializeHostedService(IEnumerable targets) + public InitializeHostedService(IEnumerable targets, ISemanticLog log) { this.targets = targets; + + this.log = log; } public async Task StartAsync(CancellationToken cancellationToken) @@ -30,6 +34,8 @@ namespace Squidex.Config.Domain foreach (var target in targets) { await target.InitializeAsync(cancellationToken); + + log.LogInformation(w => w.WriteProperty("initializedSystem", target.GetType().Name)); } } diff --git a/src/Squidex/Config/Orleans/SiloWrapper.cs b/src/Squidex/Config/Orleans/SiloWrapper.cs index a8cf76d6c..4a1150289 100644 --- a/src/Squidex/Config/Orleans/SiloWrapper.cs +++ b/src/Squidex/Config/Orleans/SiloWrapper.cs @@ -170,7 +170,7 @@ namespace Squidex.Config.Orleans public async Task StopAsync(CancellationToken cancellationToken) { - if (!lazySilo.IsValueCreated) + if (lazySilo.IsValueCreated) { isStopping = true;