[MediaWiki-commits] [Gerrit] Simplify VCL errorpage - change (operations/puppet)

2016-02-29 Thread Ema (Code Review) 
Ema has submitted this change and it was merged.

Change subject: Simplify VCL errorpage
..


Simplify VCL errorpage

We are currently returning redundant information such as the server port
and IP which we can already figure out from server.hostname and
server.identity. Further, X-Client-IP is more reliable than client.ip,
and X-Forwarded-For is not particularly interesting.

Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/templates/varnish/errorpage.inc.vcl.erb 
b/templates/varnish/errorpage.inc.vcl.erb
index 92264b6..6966315 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -26,8 +26,8 @@
 
 If you report this error to the Wikimedia System Administrators, please 
include the details below.
 
-Request from "} + client.ip + " via " + server.hostname + " " + 
server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " + 
req.xid + "" +
-regsub(req.http.X-Forwarded-For, ".+", "Forwarded for: \0") + 
regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
+Request from "} + req.http.X-Client-IP + " via " + server.hostname + " " + 
server.identity + ", Varnish XID " + req.xid + "" +
+regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
 "Error: " + obj.status + ", " + obj.response + " at " + now +
 {"
 

-- 
To view, visit https://gerrit.wikimedia.org/r/273480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Simplify VCL errorpage - change (operations/puppet)

2016-02-26 Thread Ema (Code Review) 
Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/273480

Change subject: Simplify VCL errorpage
..

Simplify VCL errorpage

We are currently returning redundant information such as the server port
and IP which we can already figure out from server.hostname and
server.identity. Further, X-Client-IP is more reliable than client.ip,
and X-Forwarded-For is not particularly interesting.

Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/273480/1

diff --git a/templates/varnish/errorpage.inc.vcl.erb 
b/templates/varnish/errorpage.inc.vcl.erb
index 92264b6..6966315 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -26,8 +26,8 @@
 
 If you report this error to the Wikimedia System Administrators, please 
include the details below.
 
-Request from "} + client.ip + " via " + server.hostname + " " + 
server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " + 
req.xid + "" +
-regsub(req.http.X-Forwarded-For, ".+", "Forwarded for: \0") + 
regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
+Request from "} + req.http.X-Client-IP + " via " + server.hostname + " " + 
server.identity + ", Varnish XID " + req.xid + "" +
+regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
 "Error: " + obj.status + ", " + obj.response + " at " + now +
 {"
 

-- 
To view, visit https://gerrit.wikimedia.org/r/273480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits