Added check and switch for Varnish 4 #105
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes #104. Varnish 4+ changes the field names for Varnish statistics fields. This change runs varnishstats -V (using popen3 because Varnish outputs all version information to stderr and not stdout) and captures the version via a regex. A case statement switches on the version. A 4 or higher results in using the new fields. Otherwise it defaults to the Varnish 3.x field names. The command also had to change because the `-f` option no longer supports a comma-separated list and now requires a glob or multiple instantiations.
|
Awesome, thanks James. :) |
aphyr
added a commit
that referenced
this pull request
Feb 1, 2015
Added check and switch for Varnish 4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #104.
Varnish 4+ changes the field names for Varnish statistics fields.
This change runs varnishstats -V (using popen3 because Varnish outputs
all version information to stderr and not stdout) and captures the
version via a regex.
A case statement switches on the version. A 4 or higher results in using
the new fields. Otherwise it defaults to the Varnish 3.x field names.
The command also had to change because the
-foption no longersupports a comma-separated list and now requires a glob or multiple
instantiations.