Merged changes #352

ChilliCream · Jan 9, 2019 · ad0eafd · ad0eafd
2 parents 862e9d5 + 194c394
commit ad0eafd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/src/Core/Core/Execution/Middleware/RequestTimeoutMiddleware.cs b/src/Core/Core/Execution/Middleware/RequestTimeoutMiddleware.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using HotChocolate.Execution.Configuration;
@@ -26,33 +27,41 @@ public RequestTimeoutMiddleware(
 
         public async Task InvokeAsync(IQueryContext context)
         {
-            var requestTimeoutCts = new CancellationTokenSource(
-                _options.ExecutionTimeout);
+            CancellationTokenSource requestTimeoutCts = null;
+            CancellationTokenSource combinedCts = null;
+
+            CancellationToken requestAborted = context.RequestAborted;
+
+            if (!Debugger.IsAttached)
+            {
+                requestTimeoutCts = new CancellationTokenSource(
+                    _options.ExecutionTimeout);
+
+                combinedCts = CancellationTokenSource.CreateLinkedTokenSource(
+                   requestTimeoutCts.Token,
+                   context.RequestAborted);
+
+                context.RequestAborted = combinedCts.Token;
+            }
 
             try
             {
-                using (var combinedCts = CancellationTokenSource
-                    .CreateLinkedTokenSource(requestTimeoutCts.Token,
-                        context.RequestAborted))
-                {
-                    context.RequestAborted = combinedCts.Token;
-                    await _next(context);
-                }
+                await _next(context);
             }
             catch (TaskCanceledException ex)
             {
-                if (!requestTimeoutCts.IsCancellationRequested)
+                if (requestAborted.IsCancellationRequested)
                 {
                     throw;
                 }
 
                 context.Exception = ex;
                 context.Result = QueryResult.CreateError(new QueryError(
                     "Execution timeout has been exceeded."));
-                return;
             }
             finally
             {
+                combinedCts.Dispose();
                 requestTimeoutCts.Dispose();
             }
         }

diff --git a/src/Core/Core/Execution/QueryExecuter.cs b/src/Core/Core/Execution/QueryExecuter.cs
@@ -91,8 +91,11 @@ private IRequestServiceScope CreateServiceScope(
             IServiceScope serviceScope =
                 _applicationServices.CreateScope();
 
-            IServiceProvider services = serviceScope.ServiceProvider.Include(
-                requestServices ?? Schema.Services);
+            IServiceProvider services = requestServices ?? Schema.Services;
+
+            services = services == null
+                ? serviceScope.ServiceProvider
+                : serviceScope.ServiceProvider.Include(requestServices);
 
             return new RequestServiceScope(services, serviceScope);
         }