Merge pull request #30 from LykkeCity/feature_LWDEV-5895-events

Fixed ChaosKitty registration (if not set in service settings).
LykkeCity · Mar 18, 2018 · 11a0c0a · 11a0c0a
2 parents 8933a74 + 7d84191
commit 11a0c0a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/Lykke.Service.Assets/Modules/CqrsModule.cs b/src/Lykke.Service.Assets/Modules/CqrsModule.cs
@@ -16,28 +16,38 @@ namespace Lykke.Service.Assets.Modules
 {
     public class CqrsModule : Module
     {
-        private readonly ApplicationSettings _settings;
+        private readonly ApplicationSettings.AssetsSettings _settings;
         private readonly ILog _log;
 
-        public CqrsModule(IReloadingManager<ApplicationSettings> settingsManager, ILog log)
+        public CqrsModule(IReloadingManager<ApplicationSettings.AssetsSettings> settingsManager, ILog log)
         {
             _settings = settingsManager.CurrentValue;
             _log = log;
         }
 
         protected override void Load(ContainerBuilder builder)
         {
-            builder
-                .RegisterType<ChaosKitty>()
-                .WithParameter(TypedParameter.From(_settings.AssetsService.ChaosKitty.StateOfChaos))
-                .As<IChaosKitty>()
-                .SingleInstance();
+            if (_settings.ChaosKitty != null)
+            {
+                builder
+                    .RegisterType<ChaosKitty>()
+                    .WithParameter(TypedParameter.From(_settings.ChaosKitty.StateOfChaos))
+                    .As<IChaosKitty>()
+                    .SingleInstance();
+            }
+            else
+            {
+                builder
+                    .RegisterType<SilentChaosKitty>()
+                    .As<IChaosKitty>()
+                    .SingleInstance();
+            }
 
             Messaging.Serialization.MessagePackSerializerFactory.Defaults.FormatterResolver = MessagePack.Resolvers.ContractlessStandardResolver.Instance;
 
             builder.Register(context => new AutofacDependencyResolver(context)).As<IDependencyResolver>().SingleInstance();
 
-            var rabbitMqSettings = new RabbitMQ.Client.ConnectionFactory { Uri = _settings.AssetsService.SagasRabbitMqConnStr };
+            var rabbitMqSettings = new RabbitMQ.Client.ConnectionFactory { Uri = _settings.SagasRabbitMqConnStr };
 #if DEBUG
             var virtualHost = "/debug";
             var messagingEngine = new MessagingEngine(_log,
@@ -55,7 +65,7 @@ protected override void Load(ContainerBuilder builder)
                 new RabbitMqTransportFactory());
 #endif
 
-            var defaultRetryDelay = (long)_settings.AssetsService.RetryDelay.TotalMilliseconds;
+            var defaultRetryDelay = (long)_settings.RetryDelay.TotalMilliseconds;
 
             builder.RegisterType<AssetsHandler>();
 
@@ -73,7 +83,7 @@ protected override void Load(ContainerBuilder builder)
                         "RabbitMq",
                         "messagepack",
                         environment: "lykke",
-                        exclusiveQueuePostfix: _settings.AssetsService.QueuePostfix)),
+                        exclusiveQueuePostfix: _settings.QueuePostfix)),
 
                 Register.BoundedContext("assets")
                     .FailedCommandRetryDelay(defaultRetryDelay)

diff --git a/src/Lykke.Service.Assets/Startup.cs b/src/Lykke.Service.Assets/Startup.cs
@@ -103,7 +103,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                 var builder = new ContainerBuilder();
 
                 builder.RegisterModule(new ApiModule(settings, _log));
-                builder.RegisterModule(new CqrsModule(settings, _log));
+                builder.RegisterModule(new CqrsModule(settings.Nested(x => x.AssetsService), _log));
                 builder.RegisterModule(new RepositoriesModule(settings, _log));
                 builder.RegisterModule(new ServicesModule());