Several proxy fixes as described in: #2204
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mathewc
reviewed
Dec 13, 2017
|
|
||
| if (function == null) | ||
| { | ||
| function = GetFunctionDescriptorFromRoute(request, _httpRoutes.GetRouteData(request)); |
There was a problem hiding this comment.
This double lookup scheme will mean we attempt to match against all function routes twice, in cases where functionRoutesFirst == true, and there isn't a match.
I wonder if it wouldn't be simpler to have a single route collection, and add a discriminator to IHttpRoute.DataTokens for each proxy. That would allow us to do filtered queries on the route collection, e.g. via an extension method something like:
public static class HttpRouteExtensions
{
public static IHttpRouteData GetRouteData(this HttpRouteCollection routes, HttpRequestMessage request, bool functionRoutesFirst = false)
{
IEnumerable<IHttpRoute> orderedRoutes = routes;
if (functionRoutesFirst)
{
orderedRoutes = routes.OrderBy(p => !(bool)p.DataTokens["IsProxyRoute"]);
}
return orderedRoutes.Select(p => p.GetRouteData(routes.VirtualPathRoot, request)).FirstOrDefault();
}
}
mathewc
reviewed
Dec 13, 2017
| @@ -14,7 +14,7 @@ internal class ProxyFunctionInvoker : FunctionInvokerBase | |||
| private ProxyClientExecutor _proxyClient; | |||
|
|
|||
| public ProxyFunctionInvoker(ScriptHost host, FunctionMetadata functionMetadata, ProxyClientExecutor proxyClient) | |||
| : base(host, functionMetadata, logDirName: "Proxy") | |||
| : base(host, functionMetadata) | |||
mathewc
reviewed
Dec 13, 2017
| // 1. If the request maps to a local http trigger function name then that function will be picked. | ||
| // 2. Else if the request maps to a custom route of a local http trigger function then that function will be picked | ||
| // 3. Otherwise the request will be given to asp.net to pick the appropriate route. | ||
| foreach (var func in _scriptHostManager.HttpFunctions.Values) |
There was a problem hiding this comment.
Good to see all this complexity go away :)
mathewc
requested changes
Dec 13, 2017
safihamid
force-pushed
the
proxyfixes
branch
from
96d0178 to
51d6ac5
Compare
mathewc
approved these changes
Dec 13, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2161
Azure/Azure-Functions#614
Azure/Azure-Functions#596