Rework retry, add consume output, remove database driver

Author: ethanhann

src/InEngine.Core/AbstractCommand.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using InEngine.Core.Exceptions;
 using InEngine.Core.IO;
 using Konsole;
 using Quartz;
@@ -32,6 +33,28 @@ public virtual void Run()
             throw new NotImplementedException();
         }
 
+        public virtual void RunWithLifeCycle()
+        {
+            try
+            {
+                CommandLifeCycle.FirePreActions(this);
+                if (SecondsBeforeTimeout <= 0)
+                    Run();
+                else
+                {
+                    var task = Task.Run(() => Run());
+                    if (!task.Wait(TimeSpan.FromSeconds(SecondsBeforeTimeout)))
+                        throw new Exception($"Scheduled command timed out after {SecondsBeforeTimeout} second(s).");
+                }
+                CommandLifeCycle.FirePostActions(this);
+            }
+            catch (Exception exception)
+            {
+                Failed(exception);
+                throw new CommandFailedException("Command failed. See inner exception for details.", exception);
+            }
+        }
+
         public virtual void Failed(Exception exception)
         {}
 
@@ -50,31 +73,17 @@ public void UpdateProgress(int tick)
         #region Scheduling
         public virtual void Execute(IJobExecutionContext context)
         {
-            if (context != null) {
+            if (context != null)
+            {
                 var properties = GetType().GetProperties();
                 context.MergedJobDataMap.ToList().ForEach(x => {
                     var property = properties.FirstOrDefault(y => y.Name == x.Key);
                     if (property != null)
-                        property.SetValue(this, x.Value);                
+                        property.SetValue(this, x.Value);
                 });
             }
 
-            try
-            {
-                CommandLifeCycle.FirePreActions(this);
-                if (SecondsBeforeTimeout <= 0)
-                    Run();
-                else {
-                    var task = Task.Run(() => Run());
-                    if (!task.Wait(TimeSpan.FromSeconds(SecondsBeforeTimeout)))
-                        throw new Exception($"Scheduled command timed out after {SecondsBeforeTimeout} second(s).");   
-                }
-                CommandLifeCycle.FirePostActions(this);
-            }
-            catch (Exception exception)
-            {
-                Failed(exception);
-            }
+            RunWithLifeCycle();
         }
         #endregion
 

src/InEngine.Core/CommandExtensions.cs

@@ -0,0 +1,11 @@
+using System;
+namespace InEngine.Core
+{
+    public static class CommandExtensions
+    {
+        public static void WriteSummaryToConsole(this AbstractCommand command)
+        {
+            Console.WriteLine($"- {command.Name} : {command.ScheduleId} | Try #{command.CommandLifeCycle.CurrentTry}");
+        }
+    }
+}

src/InEngine.Core/CommandLifeCycle.cs

@@ -11,17 +11,33 @@ public class CommandLifeCycle
 
         public bool ShouldPingBefore { get; set; }
         public string PingBeforeUrl { get; set; }
+
         public bool ShouldPingAfter { get; set; }
         public string PingAfterUrl { get; set; }
 
-
         public bool ShouldWriteOutputToFile { get; set; }
         public string WriteOutputToFilePath { get; set; }
+
         public bool ShouldAppendOutputToFile { get; set; }
         public string AppendOutputToFilePath { get; set; }
+
         public bool ShouldEmailOutput { get; set; }
         public string EmailOutputToAddress { get; set; }
 
+        public int MaximumRetries { get; set;  }
+        public int CurrentTry { get; set; }
+
+        public CommandLifeCycle IncrementRetry()
+        {
+            CurrentTry++;
+            return this;
+        }
+
+        public bool ShouldRetry()
+        {
+            return CurrentTry <= MaximumRetries;
+        }
+
         public void FirePreActions(AbstractCommand command)
         {
             try

src/InEngine.Core/InEngine.Core.csproj

@@ -34,7 +34,6 @@
   <ItemGroup>
     <Folder Include="Scheduling\" />
     <Folder Include="Queuing\Clients\" />
-    <Folder Include="Queuing\Clients\Database\" />
     <Folder Include="Scheduling\Commands\" />
   </ItemGroup>
   <ItemGroup>