Mark Bergsma has submitted this change and it was merged.
Change subject: Fix VCL bug; use varnishncsa instead of varnishlog
......................................................................
Fix VCL bug; use varnishncsa instead of varnishlog
1) VCL Fix: Move 204 error-handling out of geoip if-block
The `vcl_error` directive we added for event tracking was
accidentally nested in an if-then block, making its
execution conditional on geoiplookup being enabled. This
patch moves it outside the conditional.
2) Use varnishncsa instead of varnishlog
Like varnishlog, varnishncsa is part of the standard Varnish
distribution, and like varnishlog it tails the VSM for
matching log records and writes them to stdout. varnishncsa
is different in that it is more oriented toward logging
requests (its default behavior is to emit a standard NCSA
/ Apache request log, hence its name) and in that you can
control how it formats its output.
By using the format string '%q', we can get just the query
string, which dramatically cuts down the amount of data we
need to send. It also allows us to easily add additional
fields -- for example, '%q %t %{Referer}i' would add
a timestamp and the HTTP referer header. With varnishlog,
each field would occupy a whole line.
I'll make note of all this in the docs on wikitech.
-----------------------------------------------------------
Patch set 2: specify full path to varnishncsa in zpub.conf
Patch set 3: avoid inception! (i.e., gratuitous subshells)
-----------------------------------------------------------
Change-Id: Ie52d380335c9b3c675a5ac6ce89517a34ad1550f
---
M files/upstart/zpub.conf
M templates/varnish/bits.inc.vcl.erb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
gerrit2: Verified
--
To view, visit https://gerrit.wikimedia.org/r/21483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie52d380335c9b3c675a5ac6ce89517a34ad1550f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Asher <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: gerrit2 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
