Merge branch 'master' into minimal

janeczku · Oct 16, 2015 · d3e4dfb · d3e4dfb
2 parents bc6698f + 67149ef
commit d3e4dfb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -38,7 +38,6 @@ var (
 var exitErr error
 
 func init() {
-	log.SetFormatter(&log.TextFormatter{DisableTimestamp: true})
 	log.SetOutput(os.Stderr)
 }
 
@@ -136,12 +135,15 @@ func main() {
 		}
 
 		if c.Bool("syslog") {
-			hook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_LOCAL0|syslog.LOG_INFO, "go-dnsmasq")
+			log.SetFormatter(&log.TextFormatter{DisableTimestamp: true, DisableColors: true})
+			hook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_DAEMON|syslog.LOG_INFO, "go-dnsmasq")
 			if err != nil {
 				log.Error("Unable to connect to local syslog daemon")
 			} else {
 				log.AddHook(hook)
 			}
+		} else {
+			log.SetFormatter(&log.TextFormatter{DisableTimestamp: true})
 		}
 
 		if ns := c.String("nameservers"); ns != "" {