Mark Bergsma has submitted this change and it was merged. Change subject: Improve information in the error page ......................................................................
Improve information in the error page * Use obj.http.X-Cache instead of unreachable resp.http.X-Cache * Only display headers when present * Add server port and identity Change-Id: I6e48164538e495a6ac175694209a6453a01696ba --- M templates/varnish/errorpage.inc.vcl.erb 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/varnish/errorpage.inc.vcl.erb b/templates/varnish/errorpage.inc.vcl.erb index ad522e9..0b6495a 100644 --- a/templates/varnish/errorpage.inc.vcl.erb +++ b/templates/varnish/errorpage.inc.vcl.erb @@ -86,7 +86,20 @@ </div> <div class="TechnicalStuff"> <bdo dir="ltr"> -Request: "} + req.request + " http://"; + req.http.host + req.url + ", from " + client.ip + " via " + server.hostname + " (" + server.ip + ")<br/>Forwarded for: " + req.http.X-Forwarded-For + "<br/>Upstream caches: " + resp.http.X-Cache + "<br/>Error: " + obj.status + ", " + obj.response + " at " + now + "<br/>Varnish XID " + req.xid + {" +"} +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 {" </bdo> </div> </div> -- To view, visit https://gerrit.wikimedia.org/r/65784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e48164538e495a6ac175694209a6453a01696ba Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
