aboutsummaryrefslogtreecommitdiff
path: root/coremain/run.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2017-05-22 13:09:35 +0100
committerGravatar John Belamaric <jbelamaric@infoblox.com> 2017-05-22 08:09:35 -0400
commit024f56682dcaaaae2dd990d6fae3b54c8d17c467 (patch)
tree57ba35a5a8486ce0d23be2935880c6a0d3086d0a /coremain/run.go
parent7e6f5c77aa617bb95df10cbfacf22b1e96751169 (diff)
downloadcoredns-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 'coremain/run.go')
-rw-r--r--coremain/run.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/coremain/run.go b/coremain/run.go
index 2ae9d0b32..1c29b4be7 100644
--- a/coremain/run.go
+++ b/coremain/run.go
@@ -50,6 +50,9 @@ func init() {
caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader))
caddy.SetDefaultCaddyfileLoader("default", caddy.LoaderFunc(defaultLoader))
+
+ caddy.AppName = coreName
+ caddy.AppVersion = coreVersion
}
// Run is CoreDNS's main() function.
@@ -57,9 +60,6 @@ func Run() {
flag.Parse()
- caddy.AppName = coreName
- caddy.AppVersion = coreVersion
-
// Set up process log before anything bad happens
switch logfile {
case "stdout":