Merge pull request #200 from StevenLiekens/taskRecoveryModes

Improve MSBuild error handling for 'RecoveryMode'
chucknorris · Jul 14, 2015 · a55a790 · a55a790
2 parents 3705b95 + 5341a90
commit a55a790
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/product/roundhouse.tasks/Roundhouse.cs b/product/roundhouse.tasks/Roundhouse.cs
@@ -7,17 +7,28 @@
     using infrastructure.app.logging;
     using infrastructure.containers;
     using infrastructure.filesystem;
-    using infrastructure.logging;
+
     using Microsoft.Build.Framework;
     using migrators;
+
+    using Microsoft.Build.Utilities;
+
     using resolvers;
     using runners;
     using Environment = environments.Environment;
+    using Logger = roundhouse.infrastructure.logging.Logger;
 
     public sealed class Roundhouse : ITask, ConfigurationPropertyHolder
     {
         private RecoveryMode recoveryMode;
 
+        private readonly TaskLoggingHelper loggingHelper;
+
+        public Roundhouse()
+        {
+            this.loggingHelper = new TaskLoggingHelper(this);
+        }
+
         #region MSBuild
 
         public IBuildEngine BuildEngine { get; set; }
@@ -30,7 +41,7 @@ public sealed class Roundhouse : ITask, ConfigurationPropertyHolder
         bool ITask.Execute()
         {
             run_the_task();
-            return true;
+            return !this.loggingHelper.HasLoggedErrors;
         }
 
         #endregion
@@ -63,7 +74,7 @@ bool ITask.Execute()
 
         public string RunAfterCreateDatabaseFolderName { get; set; }
 
-		public string RunBeforeUpFolderName { get; set; }
+        public string RunBeforeUpFolderName { get; set; }
 
         public string UpFolderName { get; set; }
 
@@ -142,12 +153,14 @@ public string RecoveryMode
             set
             {
                 RecoveryMode result;
-                if (!Enum.TryParse(value, true, out result))
+                if (Enum.TryParse(value, true, out result))
                 {
-                    throw new ArgumentOutOfRangeException("value", value, "The value of 'RecoveryMode' must be one of these values: 'NoChange', 'Simple' or 'Full'.");
+                    this.recoveryMode = result;
+                }
+                else
+                {
+                    this.loggingHelper.LogError("The value of 'RecoveryMode' must be one of these values: 'NoChange', 'Simple' or 'Full'. Actual value was '{0}'.", value);
                 }
-
-                this.recoveryMode = result;
             }
         }
 
@@ -174,6 +187,11 @@ public string RecoveryMode
 
         public void run_the_task()
         {
+            if (this.loggingHelper.HasLoggedErrors)
+            {
+                return;
+            }
+
             Log4NetAppender.configure_without_console();
             ApplicationConfiguraton.set_defaults_if_properties_are_not_set(this);
 

diff --git a/product/roundhouse.tasks/roundhouse.tasks.csproj b/product/roundhouse.tasks/roundhouse.tasks.csproj
@@ -82,6 +82,7 @@
     <Reference Include="Microsoft.Build.Framework">
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NHibernate.3.3.2.4000\lib\Net35\NHibernate.dll</HintPath>