Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/65790
Change subject: Work around the fact that synthetic can only be used once ...................................................................... Work around the fact that synthetic can only be used once Change-Id: I16c7a7c00aa27aa69a81313e76c25cea87d709d9 --- M templates/varnish/errorpage.inc.vcl.erb 1 file changed, 4 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/65790/1 diff --git a/templates/varnish/errorpage.inc.vcl.erb b/templates/varnish/errorpage.inc.vcl.erb index df7b50f..a507909 100644 --- a/templates/varnish/errorpage.inc.vcl.erb +++ b/templates/varnish/errorpage.inc.vcl.erb @@ -86,20 +86,10 @@ </div> <div class="TechnicalStuff"> <bdo dir="ltr"> -"}; -synthetic "Request: " + req.request + " http://"; + req.http.host + req.url + ", from " + client.ip + " via " + server.hostname; -if (server.identity != server.hostname) { - synthetic " " + server.identity; -} -synthetic " ([" + server.ip + "]:" + server.port + "), Varnish XID " + req.xid + "<br/>"; -if (req.http.X-Forwarded-For) { - synthetic "Forwarded for: " + req.http.X-Forwarded-For + "<br/>"; -} -if (obj.http.X-Cache) { - synthetic " Upstream caches: " + obj.http.X-Cache + "<br/>"; -} -synthetic "Error: " + obj.status + ", " + obj.response + " at " + now; -synthetic {" +Request: "} + req.request + " http://"; + req.http.host + req.url + ", from " + client.ip + " via " + server.hostname + " " + server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " + req.xid + "<br/>" + +regsub(req.http.X-Forwarded-For, ".+", "Forwarded for: \0<br/>") + regsub(obj.http.X-Cache, ".+", "Upstream caches: \0<br/>") + +"Error: " + obj.status + ", " + obj.response + " at " + now + +{" </bdo> </div> </div> -- To view, visit https://gerrit.wikimedia.org/r/65790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16c7a7c00aa27aa69a81313e76c25cea87d709d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
