From 7a89214e4be8b780ef5fae74593d69e77ec99d81 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Mon, 13 Nov 2017 23:12:36 +0100
Subject: [PATCH] Closes #168

---
 .../Config/Domain/EventStoreServices.cs       |  2 +-
 src/Squidex/Config/Domain/ReadServices.cs     | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs
index e3173e3fd..e4e8df16e 100644
--- a/src/Squidex/Config/Domain/EventStoreServices.cs
+++ b/src/Squidex/Config/Domain/EventStoreServices.cs
@@ -58,7 +58,7 @@ namespace Squidex.Config.Domain
                 }
             });
 
-            services.AddSingleton<EventConsumerActor>();
+            services.AddTransient<EventConsumerActor>();
         }
     }
 }
diff --git a/src/Squidex/Config/Domain/ReadServices.cs b/src/Squidex/Config/Domain/ReadServices.cs
index a0d908423..0c3828dab 100644
--- a/src/Squidex/Config/Domain/ReadServices.cs
+++ b/src/Squidex/Config/Domain/ReadServices.cs
@@ -6,7 +6,6 @@
 //  All rights reserved.
 // ==========================================================================
 
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -90,21 +89,19 @@ namespace Squidex.Config.Domain
             services.AddSingleton<WebhookActionHandler>()
                 .As<IRuleActionHandler>();
 
-            services.AddSingleton(c => new CompoundEventConsumer(c.GetServices<IAssetEventConsumer>().ToArray()))
-                .As<IEventConsumer>();
+            services.AddSingleton<IEventConsumer>(c =>
+                new CompoundEventConsumer(c.GetServices<IAssetEventConsumer>().ToArray()));
 
-            services.AddSingleton(c =>
-                    new CompoundEventConsumer(
-                        c.GetServices<IAppEventConsumer>().OfType<IEventConsumer>()
-                            .Concat(c.GetRequiredService<CachingAppProvider>()).ToArray()))
-                .As<IEventConsumer>();
+            services.AddSingleton<IEventConsumer>(c =>
+                new CompoundEventConsumer(
+                    c.GetServices<IAppEventConsumer>().OfType<IEventConsumer>()
+                        .Concat(c.GetRequiredService<CachingAppProvider>()).ToArray()));
 
-            services.AddSingleton(c =>
-                    new CompoundEventConsumer(
-                        c.GetServices<ISchemaEventConsumer>().OfType<IEventConsumer>()
-                            .Concat(c.GetRequiredService<CachingGraphQLService>())
-                            .Concat(c.GetRequiredService<CachingSchemaProvider>()).ToArray()))
-                .As<IEventConsumer>();
+            services.AddSingleton<IEventConsumer>(c =>
+                new CompoundEventConsumer(
+                    c.GetServices<ISchemaEventConsumer>().OfType<IEventConsumer>()
+                        .Concat(c.GetRequiredService<CachingGraphQLService>())
+                        .Concat(c.GetRequiredService<CachingSchemaProvider>()).ToArray()));
 
             services.AddSingleton<RuleService>();
             services.AddSingleton<EdmModelBuilder>();