Use default config if none exist at startup

Also adds some glog flush() to ensure we see more of the log output
bowei · Feb 19, 2017 · df023ff · df023ff
1 parent f96772f
commit df023ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/dns/config/config.go b/pkg/dns/config/config.go
@@ -51,7 +51,8 @@ type Config struct {
 
 func NewDefaultConfig() *Config {
 	return &Config{
-		Federations: make(map[string]string),
+		Federations: map[string]string{},
+		StubDomains: map[string][]string{},
 	}
 }
 

diff --git a/pkg/dnsmasq/nanny.go b/pkg/dnsmasq/nanny.go
@@ -159,9 +159,12 @@ type RunNannyOpts struct {
 
 // RunNanny runs the nanny and handles configuration updates.
 func RunNanny(sync config.Sync, opts RunNannyOpts) {
+	defer glog.Flush()
+
 	currentConfig, err := sync.Once()
 	if err != nil {
-		glog.Fatalf("Error getting initial config: %v", err)
+		glog.Errorf("Error getting initial config, using default: %v", err)
+		currentConfig = config.NewDefaultConfig()
 	}
 
 	nanny := &Nanny{Exec: opts.DnsmasqExec}
@@ -175,6 +178,7 @@ func RunNanny(sync config.Sync, opts RunNannyOpts) {
 	for {
 		select {
 		case status := <-nanny.ExitChannel:
+			glog.Flush()
 			glog.Fatalf("dnsmasq exited: %v", status)
 			break
 		case currentConfig = <-configChan: