feat: Added option to throw on schema error

nikcio · Feb 6, 2022 · 519b89d · 519b89d
1 parent c4fa00f
commit 519b89d
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/Nikcio.UHeadless/Extentions/Startup/UHeadlessExtentions.cs b/src/Nikcio.UHeadless/Extentions/Startup/UHeadlessExtentions.cs
@@ -2,6 +2,7 @@
 using HotChocolate.Execution.Configuration;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Nikcio.UHeadless.Factories.Properties;
 using Nikcio.UHeadless.Factories.Properties.PropertyValues;
 using Nikcio.UHeadless.Factories.Reflection;
@@ -21,7 +22,7 @@ namespace Nikcio.UHeadless.Extentions.Startup
 {
     public static class UHeadlessExtentions
     {
-        public static IUmbracoBuilder AddUHeadless(this IUmbracoBuilder builder, List<Assembly> automapperAssemblies = null, List<Action<IPropertyMap>> customPropertyMappings = null)
+        public static IUmbracoBuilder AddUHeadless(this IUmbracoBuilder builder, List<Assembly> automapperAssemblies = null, List<Action<IPropertyMap>> customPropertyMappings = null, bool throwOnSchemaError = false)
         {
             builder.Services.AddUHeadlessAutomapper(automapperAssemblies);
 
@@ -35,7 +36,7 @@ public static IUmbracoBuilder AddUHeadless(this IUmbracoBuilder builder, List<As
 
             builder.Services
                 .AddGraphQLServer()
-                .AddUHeadlessGraphQL();
+                .AddUHeadlessGraphQL(throwOnSchemaError);
 
             return builder;
         }
@@ -75,13 +76,18 @@ private static IServiceCollection AddUHeadlessAutomapper(this IServiceCollection
             return services;
         }
 
-        public static IRequestExecutorBuilder AddUHeadlessGraphQL(this IRequestExecutorBuilder requestExecutorBuilder)
+        public static IRequestExecutorBuilder AddUHeadlessGraphQL(this IRequestExecutorBuilder requestExecutorBuilder, bool throwOnSchemaError = false)
         {
             requestExecutorBuilder
                 .InitializeOnStartup()
                 .OnSchemaError(new OnSchemaError((dc, ex) =>
                 {
-                    throw ex;
+                    var logger = dc.Services.GetService<ILogger<Query>>();
+                    logger.LogError(ex, "Schema failed to generate. GraphQL is unavalible");
+                    if (throwOnSchemaError)
+                    {
+                        throw ex;
+                    }
                 }))
                 .AddQueryType<Query>()
                 .AddTypeExtension<ContentQuery>()
@@ -100,8 +106,7 @@ public static IRequestExecutorBuilder AddUHeadlessGraphQL(this IRequestExecutorB
 
         public static IApplicationBuilder UseUHeadlessGraphQLEndpoint(this IApplicationBuilder applicationBuilder, string corsPolicy = null)
         {
-            applicationBuilder
-                .UseRouting();
+            applicationBuilder.UseRouting();
 
             if (corsPolicy != null)
             {