Mark Bergsma has submitted this change and it was merged.
Change subject: Fix backend option search logic
......................................................................
Fix backend option search logic
Change-Id: Iceb6da95033f4a52ac642cb9e15e9d8a5bc9f662
---
M templates/varnish/wikimedia.vcl.erb
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/wikimedia.vcl.erb
b/templates/varnish/wikimedia.vcl.erb
index 5644dce..96b2e7d 100644
--- a/templates/varnish/wikimedia.vcl.erb
+++ b/templates/varnish/wikimedia.vcl.erb
@@ -3,14 +3,15 @@
<%
def backend_option(backend, option, default)
if varnish_backend_options.kind_of?(Array)
- r = default
# List of hashes of options, 'backend_match' key is a regexp
against the FQDN
varnish_backend_options.each do |be_options|
if Regexp.new(be_options.fetch("backend_match",
"^.*$")).match(backend)
- r = be_options.fetch(option, r)
+ if be_options.has_key?(option)
+ return be_options[option]
+ end
end
end
- return r
+ return default
else
return varnish_backend_options.fetch(option, default)
end
--
To view, visit https://gerrit.wikimedia.org/r/60017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iceb6da95033f4a52ac642cb9e15e9d8a5bc9f662
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
