Fix SEARCH_X_ACCEL_REDIRECT to work with solr #600
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
|
Can you explain? There's no |
zas
requested changes
Jan 15, 2018
| $url_ext = "/ws/2/$resource/?" . | ||
| "max=$limit&type=$resource&fmt=$format&offset=$offset" . | ||
| "&query=" . uri_escape_utf8($query) . "&dismax=$dismax"; | ||
| } else { | ||
| my $format = ($args->{fmt} // "") eq "json" ? "mbjson" : "mbxml"; | ||
| my $def_type = $dismax eq 'true' ? 'dismax' : 'lucene'; | ||
| $redirect_url = '/internal/solr/' | ||
| $url_ext = "/$resource/select?" . | ||
| "rows=$limit&wt=$format&start=$offset" . | ||
| "&q=" . uri_escape_utf8($query) . "&defType=$def_type"; | ||
| } | ||
|
|
||
| if (DBDefs->SEARCH_X_ACCEL_REDIRECT) { |
There was a problem hiding this comment.
Since the trick is only related to X_ACCEL thing, i would keep the code together:
my $redirect_url = (DBDefs->SEARCH_ENGINE eq 'LUCENE') ? '/internal/search/' : '/internal/solr/';
return { redirect_url => $redirect_url . DBDefs->SEARCH_SERVER . $url_ext }
There was a problem hiding this comment.
It also unbreaks the code (missing semicolons :)).
I added one, not yet committed, as we need to ensure it works first location ~* ^/internal/solr/(.*?)/solr/(.*) {
internal;
# Extract url from the request
set $search_uri $2;
set $search_host $1;
# Compose url
set $search_url http://$search_host/solr/$search_uri?$args;
proxy_pass $search_url;
add_header Access-Control-Allow-Origin *;
}I'm not happy with this solution, but we just need it to work at this point. |
A fix by changing the redirect URL so that regex parsing is valid at https://github.com/metabrainz/openresty-gateways/blob/master/files/nginx/includes/musicbrainz-website_common.conf#L1
zas
approved these changes
Jan 15, 2018
mwiencek
approved these changes
Jan 16, 2018
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.
A fix by changing the redirect URL so that regex parsing is valid
at
https://github.com/metabrainz/openresty-gateways/blob/master/files/nginx/includes/musicbrainz-website_common.conf#L1