Add support for proxy_cache_path loader directives #984
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
carroarmato0
force-pushed
the
carroarmato0/proxy_cache_loader
branch
from
e8fc6db
to
0500528
Compare
|
Can you add tests to this? |
carroarmato0
force-pushed
the
carroarmato0/proxy_cache_loader
branch
3 times, most recently
from
5bef99b
to
d412d20
Compare
|
@wyardley managed to get the tests I wrote green. |
roidelapluie
requested changes
Dec 20, 2016
| @@ -157,10 +157,10 @@ http { | |||
| <% end -%> | |||
| <% if @proxy_cache_path.is_a?(Hash) -%> | |||
| <% @proxy_cache_path.sort_by{|k,v| k}.each do |key,value| -%> | |||
| proxy_cache_path <%= key %> keys_zone=<%= value %> levels=<%= @proxy_cache_levels %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive %><% if @proxy_use_temp_path %> use_temp_path=<%= @proxy_use_temp_path %><% end -%>; | |||
| proxy_cache_path <%= key %> keys_zone=<%= value %> levels=<%= @proxy_cache_levels %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive %><% if @proxy_use_temp_path %> use_temp_path=<%= @proxy_use_temp_path %><% end -%><% if @proxy_cache_loader_files %> loader_files=<%= @proxy_cache_loader_files %><% end -%><% if @proxy_cache_loader_sleep %> loader_sleep=<%= @proxy_cache_loader_sleep %><% end -%><% if @proxy_cache_loader_threshold %> loader_threshold=<%= @proxy_cache_loader_threshold %><% end -%>; | |||
There was a problem hiding this comment.
Maybe we can use -%>; and split this in multiple lines for readability?
There was a problem hiding this comment.
Nginx unfortunately doesn't allow you to work with multi-lines (except for a few directives, but the proxy_cache_path is not one of them).
So I'm afraid I can't change that.
There was a problem hiding this comment.
That is why I suggested -%>;
$ cat a.erb
a <% if true %>b <% end -%>
c
$ erb -T - < a.erb
a b c
| <% end -%> | ||
| <% elsif @proxy_cache_path -%> | ||
| proxy_cache_path <%= @proxy_cache_path %> levels=<%= @proxy_cache_levels %> keys_zone=<%= @proxy_cache_keys_zone %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive %><% if @proxy_use_temp_path %> use_temp_path=<%= @proxy_use_temp_path %><% end %>; | ||
| proxy_cache_path <%= @proxy_cache_path %> levels=<%= @proxy_cache_levels %> keys_zone=<%= @proxy_cache_keys_zone %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive %><% if @proxy_use_temp_path %> use_temp_path=<%= @proxy_use_temp_path %><% end %><% if @proxy_cache_loader_files %> loader_files=<%= @proxy_cache_loader_files %><% end -%><% if @proxy_cache_loader_sleep %> loader_sleep=<%= @proxy_cache_loader_sleep %><% end -%><% if @proxy_cache_loader_threshold %> loader_threshold=<%= @proxy_cache_loader_threshold %><% end -%>; |
There was a problem hiding this comment.
Same as above comment
carroarmato0
force-pushed
the
carroarmato0/proxy_cache_loader
branch
from
d412d20
to
a1e1c40
Compare
Signed-off-by: Christophe Vanlancker <christophe.vanlancker@inuits.eu>
carroarmato0
force-pushed
the
carroarmato0/proxy_cache_loader
branch
from
a1e1c40
to
760a586
Compare
roidelapluie
approved these changes
Dec 20, 2016
roidelapluie
force-pushed
the
carroarmato0/proxy_cache_loader
branch
from
498bb87
to
760a586
Compare
cegeka-jenkins
pushed a commit
to cegeka/puppet-nginx
that referenced
this pull request
Sep 13, 2019
…_cache_loader Add support for proxy_cache_path loader directives
Rubueno
pushed a commit
to Rubueno/puppet-nginx
that referenced
this pull request
Oct 19, 2020
…_cache_loader Add support for proxy_cache_path loader directives
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.
Add support for loader_files, loader_sleep and loader_threshold for proxy_cache_path.
http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cache_path
Signed-off-by: Christophe Vanlancker christophe.vanlancker@inuits.eu