TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

move flag blacklisting to main (#1431)

Browse source 
* move flag blacklisting to main

Doing it in init() is the wrong place or something else changed. Doing
it in main() makes it easy to see *when* this happens.

* keep trapsignals
This commit is contained in:
Miek Gieben 2018-01-25 21:40:40 +00:00 • committed by GitHub
parent ea95a2003a
commit aeacbf6e24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
coremain/run.go
View file

@ -18,20 +18,6 @@ import (
) )
func init() { func init() {
// Reset flag.CommandLine to get rid of unwanted flags for instance from glog (used in kubernetes).
// And readd the once we want to keep.
flag.VisitAll(func(f *flag.Flag) {
if _, ok := flagsBlacklist[f.Name]; ok {
return
}
flagsToKeep = append(flagsToKeep, f)
})
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
for _, f := range flagsToKeep {
flag.Var(f.Value, f.Name, f.Usage)
}
caddy.TrapSignals() caddy.TrapSignals()
caddy.DefaultConfigFile = "Corefile" caddy.DefaultConfigFile = "Corefile"
caddy.Quiet = true // don't show init stuff from caddy caddy.Quiet = true // don't show init stuff from caddy
@ -54,6 +40,19 @@ func init() {
// Run is CoreDNS's main() function. // Run is CoreDNS's main() function.
func Run() { func Run() {
// Reset flag.CommandLine to get rid of unwanted flags for instance from glog (used in kubernetes).
// And readd the once we want to keep.
flag.VisitAll(func(f *flag.Flag) {
if _, ok := flagsBlacklist[f.Name]; ok {
return
}
flagsToKeep = append(flagsToKeep, f)
})
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
for _, f := range flagsToKeep {
flag.Var(f.Value, f.Name, f.Usage)
}
flag.Parse() flag.Parse()