Improve error handling.

Squidex · Jun 23, 2022 · da5ba2d · da5ba2d
1 parent 624a147
commit da5ba2d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/LogExtensions.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/LogExtensions.cs
@@ -33,7 +33,7 @@ public static async Task DoVersionedAsync(this ILogger log, string process, long
             }
             catch (Exception ex)
             {
-                HandleException(ex, log.StepFailed);
+                log.StepFailed(ex);
             }
             finally
             {
@@ -54,7 +54,7 @@ public static async Task DoSafeAsync(this ILogger log, string process, Func<Task
             }
             catch (Exception ex)
             {
-                HandleException(ex, log.StepFailed);
+                log.StepFailed(ex);
             }
             finally
             {
@@ -68,7 +68,6 @@ public static void ProcessSkipped(this ILogger log, string process, string reaso
             try
             {
                 log.StepStart(process);
-
                 log.StepSkipped(reason);
             }
             finally
@@ -83,7 +82,6 @@ public static void ProcessCompleted(this ILogger log, string process)
             try
             {
                 log.StepStart(process);
-
                 log.StepSuccess();
             }
             finally
@@ -98,15 +96,33 @@ public static void ProcessFailed(this ILogger log, string process, Exception exc
             try
             {
                 log.StepStart(process);
+                log.StepFailed(exception);
+            }
+            finally
+            {
+                LockObject.Release();
+            }
+        }
 
-                HandleException(exception, log.StepFailed);
+        public static void ProcessFailed(this ILogger log, string process, string error)
+        {
+            LockObject.Wait();
+            try
+            {
+                log.StepStart(process);
+                log.StepFailed(error);
             }
             finally
             {
                 LockObject.Release();
             }
         }
 
+        public static void StepFailed(this ILogger log, Exception ex)
+        {
+            HandleException(ex, log.StepFailed);
+        }
+
         public static void HandleException(Exception ex, Action<string> error)
         {
             switch (ex)
@@ -129,6 +145,12 @@ public static void HandleException(Exception ex, Action<string> error)
                         break;
                     }
 
+                case FileNotFoundException ex5:
+                    {
+                        error(ex5.Message);
+                        break;
+                    }
+
                 case { } ex3:
                     {
                         error(ex3.ToString());

diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/UploadPipeline.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/UploadPipeline.cs
@@ -72,6 +72,10 @@ public UploadPipeline(ISession session, ILogger log, IFileSystem fs)
                         log.ProcessCompleted(process);
                     }
                 }
+                catch (FileNotFoundException)
+                {
+                    log.ProcessFailed(process, "File not found.");
+                }
                 catch (Exception ex)
                 {
                     log.ProcessFailed(process, ex);

diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/InheritanceProcessor.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/InheritanceProcessor.cs
@@ -17,7 +17,7 @@ public sealed class InheritanceProcessor : ISchemaProcessor
     {
         public void Process(SchemaProcessorContext context)
         {
-            var discriminator = GetDiscriminator(context.Type);
+            var discriminator = GetDiscriminator(context.ContextualType);
 
             if (discriminator != null)
             {