[MediaWiki-commits] [Gerrit] Rename 'cookie_munging' VCL subroutine to 'stash_cookie' - change (operations/puppet)

2015-07-27 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: Rename 'cookie_munging' VCL subroutine to 'stash_cookie'
..


Rename 'cookie_munging' VCL subroutine to 'stash_cookie'

We have 'evaluate_cookie', 'restore_cookie', and .. 'cookie_munging'. Rename
the latter to 'stash_cookie' for consistency with the others.

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

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



diff --git a/templates/varnish/text-common.inc.vcl.erb 
b/templates/varnish/text-common.inc.vcl.erb
index a0d0369..b35a91a 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -1,6 +1,6 @@
 // Common functions for the Text Varnish cluster
 
-sub cookie_munging {
+sub stash_cookie {
// This header is saved, and restored before sending it to MediaWiki
if (req.restarts == 0) {
set req.http.Orig-Cookie = req.http.Cookie;
@@ -32,7 +32,7 @@
 req.url !~ ^/w/load\.php) {
set req.hash_ignore_busy = true;
} else {
-   call cookie_munging;
+   call stash_cookie;
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c3ba5dc074b8c878b2d2128bc0a6a29f2a8e1d1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Rename 'cookie_munging' VCL subroutine to 'stash_cookie' - change (operations/puppet)

2015-07-16 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

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

Change subject: Rename 'cookie_munging' VCL subroutine to 'stash_cookie'
..

Rename 'cookie_munging' VCL subroutine to 'stash_cookie'

We have 'evaluate_cookie', 'restore_cookie', and .. 'cookie_munging'. Rename
the latter to 'stash_cookie' for consistency with the others.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/225281/1

diff --git a/templates/varnish/text-common.inc.vcl.erb 
b/templates/varnish/text-common.inc.vcl.erb
index a0d0369..b35a91a 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -1,6 +1,6 @@
 // Common functions for the Text Varnish cluster
 
-sub cookie_munging {
+sub stash_cookie {
// This header is saved, and restored before sending it to MediaWiki
if (req.restarts == 0) {
set req.http.Orig-Cookie = req.http.Cookie;
@@ -32,7 +32,7 @@
 req.url !~ ^/w/load\.php) {
set req.hash_ignore_busy = true;
} else {
-   call cookie_munging;
+   call stash_cookie;
}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c3ba5dc074b8c878b2d2128bc0a6a29f2a8e1d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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