THe lite profile is now setting the default to inmemory gateway persi…

…stence instead of forcing it
mserrate · Jan 4, 2012 · afec46f · afec46f
1 parent 54c3fdf
commit afec46f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/src/gateway/NServiceBus.Gateway/Config/ConfigureGateway.cs b/src/gateway/NServiceBus.Gateway/Config/ConfigureGateway.cs
@@ -12,6 +12,7 @@ namespace NServiceBus
     using Gateway.Routing.Endpoints;
     using Gateway.Routing.Sites;
     using Gateway.Sending;
+    using Raven.Client;
 
     public static class ConfigureGateway
     {
@@ -52,13 +53,28 @@ public static Configure UseInMemoryGatewayPersister(this Configure config)
             config.Configurer.ConfigureComponent<InMemoryPersistence>(DependencyLifecycle.SingleInstance);
             return config;
         }
+
+        /// <summary>
+        /// Sets the default persistence to inmemory
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        public static Configure DefaultToInMemoryGatewayPerstence(this Configure config)
+        {
+            GatewayDefaults.DefaultPersistence = () => UseInMemoryGatewayPersister(config);
+
+            return config;
+        }
         /// <summary>
         /// Use RavenDB messages persistence by the gateway.
         /// </summary>
         /// <param name="config"></param>
         /// <returns></returns>
         public static Configure UseRavenGatewayPersister(this Configure config)
         {
+            if (!config.Configurer.HasComponent<IDocumentStore>())
+                config.RavenPersistence();
+
             config.Configurer.ConfigureComponent<RavenDbPersistence>(DependencyLifecycle.SingleInstance);
             return config;
         }

diff --git a/src/gateway/NServiceBus.Gateway/Config/GatewayDefaults.cs b/src/gateway/NServiceBus.Gateway/Config/GatewayDefaults.cs
@@ -1,28 +1,20 @@
-
-namespace NServiceBus
+namespace NServiceBus.Gateway.Config
 {
-    using ObjectBuilder;
-    using Config;
-    using Gateway.Persistence;
-    using Gateway.Persistence.Raven;
-    using Gateway.Sending;
-    using Raven.Client;
+    using System;
+    using NServiceBus.Config;
+    using Persistence;
+    using Sending;
 
-    class GatewayDefaults : IWantToRunWhenConfigurationIsComplete
+    public class GatewayDefaults : IWantToRunWhenConfigurationIsComplete
     {
-        public IConfigureComponents Configurer { get; set; }
+        public static Action DefaultPersistence = () => Configure.Instance.UseRavenGatewayPersister();
+
         public void Run()
         {
-			if (!Configurer.HasComponent<GatewaySender>())
+            if (!Configure.Instance.Configurer.HasComponent<GatewaySender>() || Configure.Instance.Configurer.HasComponent<IPersistMessages>())
                 return;
-
-            if (!Configurer.HasComponent<IPersistMessages>())
-            {
-                if (!Configurer.HasComponent<IDocumentStore>())
-                    Configure.Instance.RavenPersistence();
-                Configurer.ConfigureComponent<RavenDbPersistence>(DependencyLifecycle.InstancePerCall);
-            }
-
+
+            DefaultPersistence();
         }
     }
 }
diff --git a/src/hosting/NServiceBus.Hosting.Windows/Profiles/Handlers/LiteProfileHandler.cs b/src/hosting/NServiceBus.Hosting.Windows/Profiles/Handlers/LiteProfileHandler.cs
@@ -10,16 +10,13 @@
 namespace NServiceBus.Hosting.Windows.Profiles.Handlers
 {
 
-    internal class LiteProfileHandler : IHandleProfile<Lite>, IWantTheEndpointConfig, IWantTheListOfActiveProfiles
+    internal class LiteProfileHandler : IHandleProfile<Lite>, IWantTheEndpointConfig
     {
         void IHandleProfile.ProfileActivated()
         {
-            Configure.Instance.DefaultToInMemoryTimeoutPersistence();
-
-            if (ActiveProfiles.Contains(typeof(RunGateway)))
-                Configure.Instance.UseInMemoryGatewayPersister();
-
-            Configure.Instance.AsMasterNode();
+            Configure.Instance.AsMasterNode()
+                .DefaultToInMemoryTimeoutPersistence()
+                .DefaultToInMemoryGatewayPerstence();
 
             if (!Configure.Instance.Configurer.HasComponent<ISagaPersister>())
                 Configure.Instance.InMemorySagaPersister();
@@ -35,6 +32,5 @@ void IHandleProfile.ProfileActivated()
         }
 
         public IConfigureThisEndpoint Config { get; set; }
-        public IEnumerable<Type> ActiveProfiles { get; set; }
     }
 }