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

core: -log bolean flag to enable logging (#726)

Browse source 
* core: -log bolean flag to enable logging

Change to -log flag to a boolean that defaults false and when true
logs to stdout.

* And bool here
This commit is contained in:
Miek Gieben 2017-06-09 14:09:16 +01:00 • committed by GitHub
parent 2ec96e0bb5
commit 0d72efbbf9
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
coremain/run.go
View file

@ -43,10 +43,10 @@ func init() {
flag.StringVar(&conf, "conf", "", "Corefile to load (default \""+caddy.DefaultConfigFile+"\")") flag.StringVar(&conf, "conf", "", "Corefile to load (default \""+caddy.DefaultConfigFile+"\")")
flag.StringVar(&cpu, "cpu", "100%", "CPU cap") flag.StringVar(&cpu, "cpu", "100%", "CPU cap")
flag.BoolVar(&plugins, "plugins", false, "List installed plugins") flag.BoolVar(&plugins, "plugins", false, "List installed plugins")
flag.StringVar(&logfile, "log", "", "Process log file")
flag.StringVar(&caddy.PidFile, "pidfile", "", "Path to write pid file") flag.StringVar(&caddy.PidFile, "pidfile", "", "Path to write pid file")
flag.BoolVar(&version, "version", false, "Show version") flag.BoolVar(&version, "version", false, "Show version")
flag.BoolVar(&dnsserver.Quiet, "quiet", false, "Quiet mode (no initialization output)") flag.BoolVar(&dnsserver.Quiet, "quiet", false, "Quiet mode (no initialization output)")
flag.BoolVar(&logfile, "log", false, "Log to standard output")
caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader)) caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader))
caddy.SetDefaultCaddyfileLoader("default", caddy.LoaderFunc(defaultLoader)) caddy.SetDefaultCaddyfileLoader("default", caddy.LoaderFunc(defaultLoader))
@ -61,12 +61,7 @@ func Run() {
flag.Parse() flag.Parse()
// Set up process log before anything bad happens // Set up process log before anything bad happens
switch logfile { if logfile {
case "stdout":
log.SetOutput(os.Stdout)
case "stderr":
log.SetOutput(os.Stderr)
default:
log.SetOutput(os.Stdout) log.SetOutput(os.Stdout)
} }
log.SetFlags(log.LstdFlags) log.SetFlags(log.LstdFlags)
@ -228,7 +223,7 @@ func setCPU(cpu string) error {
var ( var (
conf string conf string
cpu string cpu string
logfile string logfile bool
version bool version bool
plugins bool plugins bool
) )