Faidon Liambotis has submitted this change and it was merged.
Change subject: VCL lint: 'return(xxx)' => 'return (xxx)'
......................................................................
VCL lint: 'return(xxx)' => 'return (xxx)'
Consistently use a space after 'return' keyword, as in the built-in VCL.
Change-Id: Ice1066c0ee22332acfbf469fbc93b39ceff834cc
---
M templates/varnish/bits.inc.vcl.erb
M templates/varnish/errorpage.inc.vcl.erb
M templates/varnish/misc.inc.vcl.erb
M templates/varnish/mobile-backend.inc.vcl.erb
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
M templates/varnish/upload-backend.inc.vcl.erb
M templates/varnish/upload-frontend.inc.vcl.erb
9 files changed, 17 insertions(+), 17 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/templates/varnish/bits.inc.vcl.erb
b/templates/varnish/bits.inc.vcl.erb
index f6424fc..07cdebb 100644
--- a/templates/varnish/bits.inc.vcl.erb
+++ b/templates/varnish/bits.inc.vcl.erb
@@ -105,24 +105,24 @@
call geoip_lookup;
set obj.status = 200;
set obj.http.Connection = "keep-alive";
- return(deliver);
+ return (deliver);
}
<% end -%>
/* 204 responses shouldn't contain a body */
if (obj.status == 204) {
set obj.http.Connection = "keep-alive";
- return(deliver);
+ return (deliver);
}
/* 301 redirects for https-only wikis */
if (obj.status == 301) {
set obj.http.Location = obj.response;
set obj.status = 301;
set obj.http.Connection = "keep-alive";
- return(deliver);
+ return (deliver);
}
call errorpage;
- return(deliver);
+ return (deliver);
}
<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
diff --git a/templates/varnish/errorpage.inc.vcl.erb
b/templates/varnish/errorpage.inc.vcl.erb
index 90d5932..586d31c 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -1,7 +1,7 @@
sub errorpage {
if (obj.status >= 400) {
call synth_errorpage;
- return(deliver);
+ return (deliver);
}
}
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index cdafd99..b1166b3 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -69,5 +69,5 @@
sub vcl_error {
call errorpage;
- return(deliver);
+ return (deliver);
}
diff --git a/templates/varnish/mobile-backend.inc.vcl.erb
b/templates/varnish/mobile-backend.inc.vcl.erb
index a62f432..d214144 100644
--- a/templates/varnish/mobile-backend.inc.vcl.erb
+++ b/templates/varnish/mobile-backend.inc.vcl.erb
@@ -46,5 +46,5 @@
sub vcl_error {
call errorpage;
- return(deliver);
+ return (deliver);
}
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index ba48614..5623497 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -147,11 +147,11 @@
set obj.http.Location = obj.response;
set obj.status = 302;
set obj.http.Connection = "keep-alive";
- return(deliver);
+ return (deliver);
}
call errorpage;
- return(deliver);
+ return (deliver);
}
sub vcl_deliver {
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 5d0e8f4..b86bb77 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -49,7 +49,7 @@
call evaluate_cookie;
- return(lookup);
+ return (lookup);
}
sub vcl_pass {
@@ -92,5 +92,5 @@
sub vcl_error {
call errorpage;
- return(deliver);
+ return (deliver);
}
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index b63d51c..7ba27fd 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -109,7 +109,7 @@
call evaluate_cookie;
- return(lookup);
+ return (lookup);
}
sub vcl_pass {
@@ -136,11 +136,11 @@
set obj.status = 302;
set obj.http.Connection = "keep-alive";
set obj.http.Content-Length = "0"; # BZ #62245
- return(deliver);
+ return (deliver);
}
call errorpage;
- return(deliver);
+ return (deliver);
}
sub vcl_deliver {
diff --git a/templates/varnish/upload-backend.inc.vcl.erb
b/templates/varnish/upload-backend.inc.vcl.erb
index ce1b538..eb3959e 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -157,7 +157,7 @@
sub vcl_error {
call errorpage;
- return(deliver);
+ return (deliver);
}
sub vcl_deliver {
diff --git a/templates/varnish/upload-frontend.inc.vcl.erb
b/templates/varnish/upload-frontend.inc.vcl.erb
index 8cb1a95..0096ba7 100644
--- a/templates/varnish/upload-frontend.inc.vcl.erb
+++ b/templates/varnish/upload-frontend.inc.vcl.erb
@@ -97,11 +97,11 @@
set obj.http.Access-Control-Allow-Methods = "GET, HEAD,
OPTIONS";
set obj.http.Access-Control-Max-Age = "86400";
- return(deliver);
+ return (deliver);
}
call errorpage;
- return(deliver);
+ return (deliver);
}
sub vcl_deliver {
--
To view, visit https://gerrit.wikimedia.org/r/184568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice1066c0ee22332acfbf469fbc93b39ceff834cc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
