Update EasyNetQ.Scheduler with EnableLegacyConventions setting (#923)

* Update EasyNetQ.Scheduler to include config setting to be able to invoke legacy conventions on creation of rabbit bus

* Also update EasyNetQ.Scheduler.Mongo to include config setting to be able to invoke legacy conventions on creation of rabbit bus

Author: harrisonmeister

Source/EasyNetQ.Scheduler.Mongo.Tests/SchedulerServiceTests.cs

@@ -26,7 +26,8 @@ public SchedulerServiceTests()
                         HandleTimeoutInterval = TimeSpan.FromSeconds(1),
                         PublishInterval = TimeSpan.FromSeconds(1),
                         SubscriptionId = "Scheduler",
-                        PublishMaxSchedules = 2
+                        PublishMaxSchedules = 2,
+                        EnableLegacyConventions = false
                     });
         }
 

Source/EasyNetQ.Scheduler.Mongo/ConfigurationBase.cs

@@ -28,5 +28,17 @@ protected static TimeSpan GetTimeSpanAppSettings(string settingKey)
             }
             return value;
         }
+
+        protected static bool GetBoolAppSetting(string settingKey)
+        {
+            var appSetting = ConfigurationManager.AppSettings[settingKey];
+            bool value;
+            if (!bool.TryParse(appSetting, out value))
+            {
+                throw new ApplicationException(String.Format("AppSetting '{0}' value '{1}' is not a valid boolean",
+                                                             settingKey, appSetting));
+            }
+            return value;
+        }
     }
 }

Source/EasyNetQ.Scheduler.Mongo/SchedulerServiceConfiguration.cs

@@ -10,6 +10,7 @@ public class SchedulerServiceConfiguration : ConfigurationBase, ISchedulerServic
         public TimeSpan PublishInterval { get; set; }
         public TimeSpan HandleTimeoutInterval { get; set; }
         public int PublishMaxSchedules { get; set; }
+        public bool EnableLegacyConventions { get; set; }
 
         public static SchedulerServiceConfiguration FromConfigFile()
         {
@@ -19,6 +20,7 @@ public static SchedulerServiceConfiguration FromConfigFile()
                     PublishInterval = GetTimeSpanAppSettings("publishInterval"),
                     PublishMaxSchedules = GetIntAppSetting("publishMaxSchedules"),
                     HandleTimeoutInterval = GetTimeSpanAppSettings("handleTimeoutInterval"),
+                    EnableLegacyConventions = GetBoolAppSetting("enableLegacyConventions")
                 };
         }
     }

Source/EasyNetQ.Scheduler.Mongo/SchedulerServiceFactory.cs

@@ -8,7 +8,14 @@ public static class SchedulerServiceFactory
     {
         public static ISchedulerService CreateScheduler()
         {
-            var bus = RabbitHutch.CreateBus("host=localhost");
+            var serviceConfig = SchedulerServiceConfiguration.FromConfigFile();
+            var bus = RabbitHutch.CreateBus("host=localhost", sr =>
+            {
+                if (serviceConfig.EnableLegacyConventions)
+                {
+                    sr.EnableLegacyConventions();
+                }
+            });
 
             return new SchedulerService(
                 bus,

Source/EasyNetQ.Scheduler.Mongo/app.config

@@ -35,6 +35,9 @@
 
     <!-- How long between each handle for messages failed to publish-->
     <add key="handleTimeoutInterval" value="00:05:00"/>
+
+    <!-- Enable Legacy Conventions for Rabbit Queues -->
+    <add key="enableLegacyConventions" value="false"/>
   </appSettings>
 
   <log4net>

Source/EasyNetQ.Scheduler.Tests/SchedulerServiceTests.cs

@@ -32,7 +32,8 @@ public SchedulerServiceTests()
                 new SchedulerServiceConfiguration
                 {
                     PublishIntervalSeconds = 1,
-                    PurgeIntervalSeconds = 1
+                    PurgeIntervalSeconds = 1,
+                    EnableLegacyConventions = false
                 });
         }
 

Source/EasyNetQ.Scheduler/ConfigurationBase.cs

@@ -28,5 +28,17 @@ public static int GetIntAppSetting(string settingKey)
             }
             return value;
         }
+
+        public static bool GetBoolAppSetting(string settingKey)
+        {
+            var appSetting = ConfigurationManager.AppSettings[settingKey];
+            bool value;
+            if (!bool.TryParse(appSetting, out value))
+            {
+                throw new ApplicationException(string.Format("AppSetting '{0}' value '{1}' is not a valid boolean",
+                                                             settingKey, appSetting));
+            }
+            return value;
+        }
     }
 }

Source/EasyNetQ.Scheduler/SchedulerServiceConfiguration.cs

@@ -4,13 +4,15 @@ public class SchedulerServiceConfiguration : ConfigurationBase
     {
         public int PublishIntervalSeconds { get; set; }
         public int PurgeIntervalSeconds { get; set; }
+        public bool EnableLegacyConventions { get; set; }
 
         public static SchedulerServiceConfiguration FromConfigFile()
         {
             return new SchedulerServiceConfiguration
             {
                 PublishIntervalSeconds = GetIntAppSetting("PublishIntervalSeconds"),
-                PurgeIntervalSeconds = GetIntAppSetting("PurgeIntervalSeconds")
+                PurgeIntervalSeconds = GetIntAppSetting("PurgeIntervalSeconds"),
+                EnableLegacyConventions = GetBoolAppSetting("EnableLegacyConventions")
             };
         }
     }

Source/EasyNetQ.Scheduler/SchedulerServiceFactory.cs

@@ -6,9 +6,16 @@ public static class SchedulerServiceFactory
     {
         public static ISchedulerService CreateScheduler()
         {
-            var bus = RabbitHutch.CreateBus();
+            var serviceConfig = SchedulerServiceConfiguration.FromConfigFile();
+            var bus = RabbitHutch.CreateBus(sr =>
+            {
+                if (serviceConfig.EnableLegacyConventions)
+                {
+                    sr.EnableLegacyConventions();
+                }
+            });
             return new SchedulerService(
-                bus, 
+                bus,
                 new ScheduleRepository(ScheduleRepositoryConfiguration.FromConfigFile(), () => DateTime.UtcNow),
                 SchedulerServiceConfiguration.FromConfigFile());
         }

Source/EasyNetQ.Scheduler/app.config

@@ -28,6 +28,9 @@
 
     <!-- How long between each purge -->
     <add key="PurgeIntervalSeconds" value="5"/>
+
+    <!-- Enable Legacy Conventions for Rabbit Queues -->
+    <add key="EnableLegacyConventions" value="false"/>
   </appSettings>
 
   <log4net>