Merge pull request #899 from eventflow/fix-missing-id-in-log

Fix missing id in log
eventflow · Sep 9, 2021 · d93b883 · d93b883
2 parents b03967c + f866bc8
commit d93b883
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Source/EventFlow/EventFlowOptions.cs b/Source/EventFlow/EventFlowOptions.cs
@@ -22,8 +22,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using EventFlow.Aggregates;
 using EventFlow.Commands;
@@ -53,11 +53,11 @@ namespace EventFlow
 {
     public class EventFlowOptions : IEventFlowOptions
     {
-        private readonly List<Type> _aggregateEventTypes = new List<Type>();
-        private readonly List<Type> _sagaTypes = new List<Type>(); 
-        private readonly List<Type> _commandTypes = new List<Type>();
+        private readonly ConcurrentBag<Type> _aggregateEventTypes = new ConcurrentBag<Type>();
+        private readonly ConcurrentBag<Type> _sagaTypes = new ConcurrentBag<Type>(); 
+        private readonly ConcurrentBag<Type> _commandTypes = new ConcurrentBag<Type>();
         private readonly EventFlowConfiguration _eventFlowConfiguration = new EventFlowConfiguration();
-        private readonly List<Type> _jobTypes = new List<Type>
+        private readonly ConcurrentBag<Type> _jobTypes = new ConcurrentBag<Type>
             {
                 typeof(PublishCommandJob),
                 typeof(DispatchToAsynchronousEventSubscribersJob)
@@ -73,8 +73,13 @@ private EventFlowOptions(IServiceCollection serviceCollection)
             RegisterDefaults(ServiceCollection);
         }
 
-        public static IEventFlowOptions New() => new EventFlowOptions(new ServiceCollection()
-            .AddLogging(b => b.AddConsole()));
+        public static IEventFlowOptions New() => 
+            new EventFlowOptions(
+                new ServiceCollection()
+                    .AddLogging(b => b
+                        .SetMinimumLevel(LogLevel.Trace)
+                        .AddConsole()));
+
         public static IEventFlowOptions New(IServiceCollection serviceCollection) => new EventFlowOptions(serviceCollection);
 
         public IEventFlowOptions ConfigureOptimisticConcurrencyRetry(int retries, TimeSpan delayBeforeRetry)
@@ -212,7 +217,7 @@ private void RegisterDefaults(IServiceCollection serviceCollection)
             serviceCollection.TryAddSingleton<ISagaDefinitionService, SagaDefinitionService>();
             serviceCollection.TryAddSingleton<ICommandDefinitionService, CommandDefinitionService>();
 
-            serviceCollection.AddSingleton<ILoadedVersionedTypes>(r => new LoadedVersionedTypes(
+            serviceCollection.TryAddSingleton<ILoadedVersionedTypes>(r => new LoadedVersionedTypes(
                 _jobTypes,
                 _commandTypes,
                 _aggregateEventTypes,

diff --git a/Source/EventFlow/IEventFlowOptions.cs b/Source/EventFlow/IEventFlowOptions.cs
@@ -32,6 +32,7 @@ public interface IEventFlowOptions
     {
         IServiceCollection ServiceCollection { get; }
 
+        IEventFlowOptions ConfigureThrowSubscriberExceptions(bool shouldThrow);
         IEventFlowOptions ConfigureOptimisticConcurrencyRetry(int retries, TimeSpan delayBeforeRetry);
         IEventFlowOptions Configure(Action<EventFlowConfiguration> configure);
         IEventFlowOptions AddEvents(IEnumerable<Type> aggregateEventTypes);

diff --git a/Source/EventFlow/ReadStores/ReadModelFactory.cs b/Source/EventFlow/ReadStores/ReadModelFactory.cs
@@ -66,7 +66,8 @@ public Task<TReadModel> CreateAsync(string id, CancellationToken cancellationTok
             {
                 _logger.LogTrace(
                     "Creating new instance of read model type {ReadModelType} with ID {Id}",
-                    typeof(TReadModel).PrettyPrint());
+                    typeof(TReadModel).PrettyPrint(),
+                    id);
             }
 
             var readModel = (TReadModel) Activator.CreateInstance(typeof(TReadModel));