Merge branch 'develop'

Author: ethanhann

docs-src/queuing.md

@@ -124,17 +124,17 @@ Queued commands can be viewed in JSON which maybe useful for debugging:
 inengine.exe -pInEngine.Core queue:peek --pending --json
 ```  
 
-By default, up to 10 messages will be retrieved, but the number is configurable:
+By default, up to the first 10 messages will be retrieved, but the range is configurable:
 
 ```bash
-inengine.exe -pInEngine.Core queue:peek --pending --limit=100
+inengine.exe -pInEngine.Core queue:peek --pending --to=100
 ```
 
-The a paginated slice of the queue can be retrieved using the offset argument.
+A slice of the queue can be retrieved using the from argument.
 For example, this queue:peek call retrieves the 100-200 queued commands:
 
 ```bash
-inengine.exe -pInEngine.Core queue:peek --pending --limit=100 --offset=100
+inengine.exe -pInEngine.Core queue:peek --pending --from=100 --to=200
 ```
 
 ## Handling Failed Commands

src/InEngine.Core.Test/appsettings.json

@@ -7,7 +7,8 @@
       "UseCompression": false,
       "PrimaryQueueConsumers": 16,
       "SecondaryQueueConsumers": 4,
-      "QueueName": "InEngine:Queue",
+      "QueueDriver": "file",
+      "QueueName": "InEngineQueue",
       "RedisHost": "localhost",
       "RedisPort": 6379,
       "RedisDb": 0,

src/InEngine.Core/AbstractCommand.cs

@@ -1,15 +1,17 @@
 using System;
 using System.Linq;
+using InEngine.Core.Exceptions;
 using InEngine.Core.IO;
 using InEngine.Core.Scheduling;
 using Konsole;
 using Quartz;
+using RestSharp;
 
 namespace InEngine.Core
 {
     abstract public class AbstractCommand : ICommand, IFailed, IJob, IWrite
     {
-        public LifecycleActions LifecycleActions { get; set; }
+        public ExecutionLifeCycle ExecutionLifeCycle { get; set; }
         public Write Write { get; set; }
         public ProgressBar ProgressBar { get; internal set; }
         public string Name { get; set; }
@@ -22,7 +24,7 @@ protected AbstractCommand()
             Name = GetType().FullName;
             SchedulerGroup = GetType().AssemblyQualifiedName;
             Write = new Write();
-            LifecycleActions = new LifecycleActions();
+            ExecutionLifeCycle = new ExecutionLifeCycle();
         }
 
         public virtual void Run()
@@ -57,9 +59,9 @@ public void Execute(IJobExecutionContext context)
 
             try
             {
-                LifecycleActions.BeforeAction?.Invoke(this);
+                ExecutionLifeCycle.FirePreActions(this);
                 Run();
-                LifecycleActions.AfterAction?.Invoke(this);
+                ExecutionLifeCycle.FirePostActions(this);
             }
             catch (Exception exception)
             {
@@ -124,6 +126,16 @@ public IWrite Newline(int count = 1)
         {
             return Write.Newline(count);
         }
+
+        public string FlushBuffer()
+        {
+            return Write.FlushBuffer();
+        }
+
+        public void ToFile(string path, string text, bool shouldAppend = false)
+        {
+            Write.ToFile(path, text, shouldAppend);
+        }
         #endregion
     }
 }

src/InEngine.Core/Exceptions/LifecycleActionFailedException.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace InEngine.Core.Exceptions
+{
+    public class LifecycleActionFailedException : Exception
+    {
+        public LifecycleActionFailedException(string message, Exception exception) : base(message, exception)
+        {}
+    }
+}

src/InEngine.Core/IO/Http.cs

@@ -0,0 +1,12 @@
+using RestSharp;
+
+namespace InEngine.Core.IO
+{
+    public class Http
+    {
+        public string Get(string url)
+        {
+            return new RestClient(url).Execute(new RestRequest(string.Empty, Method.GET)).Content;
+        }
+    }
+}

src/InEngine.Core/IO/IWrite.cs

@@ -16,5 +16,8 @@ public interface IWrite
         IWrite ErrorText(string val);
         IWrite Text(string val);
         IWrite ColoredText(string val, ConsoleColor consoleColor);
+
+        string FlushBuffer();
+        void ToFile(string path, string text, bool shouldAppend = false);
     }
 }

src/InEngine.Core/IO/Mail.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Net.Mail;
+
+namespace InEngine.Core.IO
+{
+    public class Mail
+    {
+        public string Host { get; set; }
+        public int Port { get; set; }
+
+        public void Send(string fromAddress, string toAddress, string subject, string body)
+        {
+            new SmtpClient() {
+                Host = Host,
+                Port = Port
+            }.Send(new MailMessage(fromAddress, toAddress, subject, body));
+        }
+    }
+}

src/InEngine.Core/IO/Write.cs

@@ -1,13 +1,21 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
 
 namespace InEngine.Core.IO
 {
     public class Write : IWrite
     {
+        static Mutex consoleOutputLock = new Mutex();
+        static Mutex fileOutputLock = new Mutex();
+
         public ConsoleColor InfoColor { get; set; } = ConsoleColor.Green;
         public ConsoleColor WarningColor { get; set; } = ConsoleColor.Yellow;
         public ConsoleColor ErrorColor { get; set; } = ConsoleColor.Red;
         public ConsoleColor LineColor { get; set; } = ConsoleColor.White;
+        public List<string> Buffer { get; set; } = new List<string>();
 
         public IWrite Newline(int count = 1)
         {
@@ -38,9 +46,12 @@ public IWrite Line(string val)
 
         public IWrite ColoredLine(string val, ConsoleColor consoleColor)
         {
+            consoleOutputLock.WaitOne();
             Console.ForegroundColor = consoleColor;
             Console.WriteLine(val);
             Console.ResetColor();
+            consoleOutputLock.ReleaseMutex();
+            Buffer.Add(val);
             return this;
         }
 
@@ -66,10 +77,32 @@ public IWrite Text(string val)
 
         public IWrite ColoredText(string val, ConsoleColor consoleColor)
         {
+            consoleOutputLock.WaitOne();
             Console.ForegroundColor = consoleColor;
             Console.Write(val);
             Console.ResetColor();
+            consoleOutputLock.ReleaseMutex();
+            Buffer.Add(val);
             return this;
         }
+
+        public string FlushBuffer()
+        {
+            var str = string.Join("\n", Buffer);
+            Buffer.Clear();
+            return str;
+        }
+
+        public void ToFile(string path, string text, bool shouldAppend = false)
+        {
+            fileOutputLock.WaitOne();
+            if (!File.Exists(path))
+                File.Create(path);
+            if (shouldAppend)
+                File.AppendAllText(path, text);
+            else
+                File.WriteAllText(path, text);
+            fileOutputLock.ReleaseMutex();
+        }
     }
 }

src/InEngine.Core/InEngine.Core.csproj

@@ -26,9 +26,16 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
     <PackageReference Include="StackExchange.Redis" Version="1.2.4" />
     <PackageReference Include="Goblinfactory.Konsole" Version="3.1.0" />
+    <PackageReference Include="EntityFramework" Version="6.2.0" />
+    <PackageReference Include="RestSharp" Version="106.1.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Scheduling\" />
+    <Folder Include="Queuing\Clients\" />
+    <Folder Include="Queuing\Clients\Database\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
 </Project>
 

src/InEngine.Core/InEngineSettings.cs

@@ -11,6 +11,7 @@ public class InEngineSettings
         public static string ConfigurationFile { get; set; } = "appsettings.json";
         public List<string> Plugins { get; set; } = new List<string>();
         public QueueSettings Queue { get; set; }
+        public MailSettings Mail { get; set; }
 
         public static InEngineSettings Make()
         {