Fixing the host check timeout and middleware registration order

fabiocav · fabiocav · commit 9aa7572bd66d · 2017-11-17T17:03:47.000-08:00
diff --git a/src/WebJobs.Script.WebHost/Middleware/ScriptHostCheckMiddleware.cs b/src/WebJobs.Script.WebHost/Middleware/ScriptHostCheckMiddleware.cs
@@ -30,7 +30,7 @@ public async Task Invoke(HttpContext httpContext, WebScriptHostManager manager)
 
             if (!bypassHostCheck)
             {
-                bool hostReady = await manager.DelayUntilHostReady(timeoutSeconds: 5);
+                bool hostReady = await manager.DelayUntilHostReady();
 
                 if (!hostReady)
                 {
diff --git a/src/WebJobs.Script.WebHost/WebJobsApplicationBuilderExtension.cs b/src/WebJobs.Script.WebHost/WebJobsApplicationBuilderExtension.cs
@@ -19,12 +19,14 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder
         public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder builder, IApplicationLifetime applicationLifetime, Action<WebJobsRouteBuilder> routes)
         {
             builder.UseMiddleware<FunctionInvocationMiddleware>();
-            builder.UseHttpBindingRouting(applicationLifetime, routes);
             builder.UseWhen(context => !context.Request.Path.StartsWithSegments("/admin/host/status"), config =>
             {
                 config.UseMiddleware<ScriptHostCheckMiddleware>();
             });
 
+            // Ensure the HTTP binding routing is registered after all middleware
+            builder.UseHttpBindingRouting(applicationLifetime, routes);
+
             builder.UseMvc(r =>
             {
                 r.MapRoute(name: "Home",

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public async Task Invoke(HttpContext httpContext, WebScriptHostManager manager)`
`30`	`30`
`31`	`31`	`if (!bypassHostCheck)`
`32`	`32`	`{`
`33`		`- bool hostReady = await manager.DelayUntilHostReady(timeoutSeconds: 5);`
	`33`	`+ bool hostReady = await manager.DelayUntilHostReady();`
`34`	`34`
`35`	`35`	`if (!hostReady)`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,14 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder`
`19`	`19`	`public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder builder, IApplicationLifetime applicationLifetime, Action<WebJobsRouteBuilder> routes)`
`20`	`20`	`{`
`21`	`21`	`builder.UseMiddleware<FunctionInvocationMiddleware>();`
`22`		`- builder.UseHttpBindingRouting(applicationLifetime, routes);`
`23`	`22`	`builder.UseWhen(context => !context.Request.Path.StartsWithSegments("/admin/host/status"), config =>`
`24`	`23`	`{`
`25`	`24`	`config.UseMiddleware<ScriptHostCheckMiddleware>();`
`26`	`25`	`});`
`27`	`26`
	`27`	`+ // Ensure the HTTP binding routing is registered after all middleware`
	`28`	`+ builder.UseHttpBindingRouting(applicationLifetime, routes);`
	`29`	`+`
`28`	`30`	`builder.UseMvc(r =>`
`29`	`31`	`{`
`30`	`32`	`r.MapRoute(name: "Home",`