diff options
| author |  Miek Gieben <miek@miek.nl>
| 2017-05-22 13:09:35 +0100 |
|---|---|---|
| committer |  John Belamaric <jbelamaric@infoblox.com>
| 2017-05-22 08:09:35 -0400 |
| commit | 024f56682dcaaaae2dd990d6fae3b54c8d17c467 (patch) | |
| tree | 57ba35a5a8486ce0d23be2935880c6a0d3086d0a /middleware/chaos/setup.go | |
| parent | 7e6f5c77aa617bb95df10cbfacf22b1e96751169 (diff) | |
| download | coredns-024f56682dcaaaae2dd990d6fae3b54c8d17c467.tar.gz coredns-024f56682dcaaaae2dd990d6fae3b54c8d17c467.tar.zst coredns-024f56682dcaaaae2dd990d6fae3b54c8d17c467.zip | |
middleware/chaos: fix version (#669)
* middleware/chaos: fix version
Move the version setting into a init function so it is done early. Then
tweak the setup code for chaos a bit to correctly pick this version up.
Add an integration test to pick this up in the toplevel test/ directory.
Fixes #667
* Update tests
Diffstat (limited to 'middleware/chaos/setup.go')
| -rw-r--r-- | middleware/chaos/setup.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/middleware/chaos/setup.go b/middleware/chaos/setup.go index 816dc7944..17b4f90cc 100644 --- a/middleware/chaos/setup.go +++ b/middleware/chaos/setup.go @@ -12,6 +12,7 @@ func init() { ServerType: "dns", Action: setup, }) + } func setup(c *caddy.Controller) error { @@ -28,13 +29,16 @@ func setup(c *caddy.Controller) error { } func chaosParse(c *caddy.Controller) (string, map[string]bool, error) { + // Set here so we pick up AppName and AppVersion that get set in coremain's init(). + chaosVersion = caddy.AppName + "-" + caddy.AppVersion + version := "" authors := make(map[string]bool) for c.Next() { args := c.RemainingArgs() if len(args) == 0 { - return defaultVersion, nil, nil + return chaosVersion, nil, nil } if len(args) == 1 { return args[0], nil, nil @@ -48,4 +52,4 @@ func chaosParse(c *caddy.Controller) (string, map[string]bool, error) { return version, authors, nil } -var defaultVersion = caddy.AppName + "-" + caddy.AppVersion +var chaosVersion string |