Remove most static settings factory references

Author: ethanhann

src/InEngine.Core/AbstractCommand.cs

@@ -10,7 +10,7 @@
 
 namespace InEngine.Core
 {
-    abstract public class AbstractCommand : IJob, IWrite, IHasCommandLifeCycle
+    abstract public class AbstractCommand : IJob, IWrite, IHasCommandLifeCycle, IHasMailSettings
     {
         protected ILog Log { get; set; }
         public CommandLifeCycle CommandLifeCycle { get; set; }
@@ -20,6 +20,7 @@ abstract public class AbstractCommand : IJob, IWrite, IHasCommandLifeCycle
         public string SchedulerGroup { get; set; }
         public string ScheduleId { get; set; }
         public int SecondsBeforeTimeout { get; set; }
+        public MailSettings MailSettings { get; set; } 
 
         protected AbstractCommand()
         {
@@ -29,7 +30,7 @@ protected AbstractCommand()
             SchedulerGroup = GetType().AssemblyQualifiedName;
             Write = new Write();
             CommandLifeCycle = new CommandLifeCycle() {
-                MailSettings = InEngineSettings.Make().Mail
+                MailSettings = MailSettings
             };
             SecondsBeforeTimeout = 300;
         }
@@ -89,7 +90,6 @@ public virtual void Execute(IJobExecutionContext context)
                         property.SetValue(this, x.Value);
                 });
             }
-
             RunWithLifeCycle();
         }
         #endregion

src/InEngine.Core/Commands/Exec.cs

@@ -21,9 +21,8 @@ public class Exec : AbstractCommand
 
         public override void Run()
         {
-            var settings = InEngineSettings.Make();
             if (ExecWhitelist == null)
-                ExecWhitelist = settings.ExecWhitelist;
+                ExecWhitelist = InEngineSettings.Make().ExecWhitelist;
             if (!ExecWhitelist.ContainsKey(Executable))
                 throw new CommandFailedException("Executable is not whitelisted.");
             var fileName = ExecWhitelist[Executable];

src/InEngine.Core/IO/IHasMailSettings.cs

@@ -0,0 +1,7 @@
+namespace InEngine.Core.IO
+{
+    public interface IHasMailSettings
+    {
+        MailSettings MailSettings { get; set; }
+    }
+}

src/InEngine.Core/LifeCycle/CommandLifeCycle.cs

@@ -87,13 +87,12 @@ public void FirePostActions(AbstractCommand command)
             try
             {
                 if (ShouldEmailOutput)
-                    new IO.Mail() {
+                    new Mail() {
                         Host = MailSettings.Host,
                         Port = MailSettings.Port,
                         Username = MailSettings.Username,
                         Password = MailSettings.Password,
-                    }
-                    .Send(MailSettings.From, EmailOutputToAddress, emailSubject, commandOutput);
+                    }.Send(MailSettings.From, EmailOutputToAddress, emailSubject, commandOutput);
             }
             catch (Exception exception)
             {

src/InEngine.Core/Queuing/Clients/FileClient.cs

@@ -5,6 +5,7 @@
 using System.Threading;
 using Common.Logging;
 using InEngine.Core.Exceptions;
+using InEngine.Core.IO;
 using InEngine.Core.Queuing.Message;
 
 namespace InEngine.Core.Queuing.Clients
@@ -13,6 +14,7 @@ public class FileClient : IQueueClient
     {
         static Mutex consumeLock = new Mutex();
         public static FileClientSettings ClientSettings { get; set; }
+        public MailSettings MailSettings { get; set; }
 
         public ILog Log { get; set; } = LogManager.GetLogger<FileClient>();
         public int Id { get; set; } = 0;

src/InEngine.Core/Queuing/Clients/RabbitMQClient.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using Common.Logging;
 using InEngine.Core.Exceptions;
+using InEngine.Core.IO;
 using InEngine.Core.Queuing.Message;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
@@ -13,6 +14,7 @@ namespace InEngine.Core.Queuing.Clients
     public class RabbitMQClient : IQueueClient, IDisposable
     {
         public static RabbitMQClientSettings ClientSettings { get; set; } 
+        public MailSettings MailSettings { get; set; }
 
         public ILog Log { get; set; } = LogManager.GetLogger<SyncClient>();
         public int Id { get; set; } = 0;

src/InEngine.Core/Queuing/Clients/RedisClient.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Common.Logging;
 using InEngine.Core.Exceptions;
+using InEngine.Core.IO;
 using InEngine.Core.Queuing.Message;
 using StackExchange.Redis;
 
@@ -13,6 +14,7 @@ namespace InEngine.Core.Queuing.Clients
     public class RedisClient : IQueueClient
     {
         public static RedisClientSettings ClientSettings { get; set; }
+        public MailSettings MailSettings { get; set; }
 
         public ILog Log { get; set; } = LogManager.GetLogger<RedisClient>();
         public int Id { get; set; } = 0;

src/InEngine.Core/Queuing/Clients/SyncClient.cs

@@ -2,12 +2,15 @@
 using System.Collections.Generic;
 using System.Threading;
 using Common.Logging;
+using InEngine.Core.IO;
 using InEngine.Core.Queuing.Message;
 
 namespace InEngine.Core.Queuing.Clients
 {
     public class SyncClient : IQueueClient
     {
+        public MailSettings MailSettings { get; set; }
+
         public ILog Log { get; set; } = LogManager.GetLogger<SyncClient>();
         public int Id { get; set; } = 0;
         public string QueueBaseName { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

src/InEngine.Core/Queuing/Commands/Consume.cs

@@ -5,7 +5,7 @@
 
 namespace InEngine.Core.Queuing.Commands
 {
-    public class Consume : AbstractCommand
+    public class Consume : AbstractCommand, IHasQueueSettings
     {
         [Option("all", HelpText = "Consume all the messages in the primary or secondary queue.")]
         public bool ShouldConsumeAll { get; set; }
@@ -16,9 +16,11 @@ public class Consume : AbstractCommand
         [Option("secondary", DefaultValue = false, HelpText = "Consume from the secondary queue.")]
         public bool UseSecondaryQueue { get; set; }
 
+        public QueueSettings QueueSettings { get; set; }
+
         public override void Run()
         {
-            var queue = QueueAdapter.Make(UseSecondaryQueue);
+            var queue = QueueAdapter.Make(UseSecondaryQueue, QueueSettings, MailSettings);
             ICommandEnvelope commandEnvelope;
             while (ShouldConsumeAll)
                 try

src/InEngine.Core/Queuing/Commands/Flush.cs

@@ -3,7 +3,7 @@
 
 namespace InEngine.Core.Queuing.Commands
 {
-    public class Flush : AbstractCommand
+    public class Flush : AbstractCommand, IHasQueueSettings
     {
         [Option("pending", HelpText = "Clear the pending queue.")]
         public bool PendingQueue { get; set; }
@@ -17,11 +17,13 @@ public class Flush : AbstractCommand
         [Option("secondary", HelpText = "Clear secondary queues. Primary queues are cleared by default.")]
         public bool UseSecondaryQueue { get; set; }
 
+        public QueueSettings QueueSettings { get; set; }
+
         public override void Run()
         {
             if (PendingQueue == false && FailedQueue == false && InProgressQueue == false)
                 throw new CommandFailedException("Must specify at least one queue to clear. Use -h to see available options.");
-            var queue = QueueAdapter.Make(UseSecondaryQueue);
+            var queue = QueueAdapter.Make(UseSecondaryQueue, QueueSettings, MailSettings);
             if (PendingQueue)
                 Info($"Pending: {queue.ClearPendingQueue().ToString()}");
             if (InProgressQueue)