#123: log Console

daemonize.go

@@ -8,7 +8,7 @@ import (
 )
 
 func Deamonize(proc func()) {
-	context := new(daemon.Context)
+	context := daemon.Context{LogFileName: "/dev/stdout"}
 
 	child, err := context.Reborn()
 	if err != nil {
@@ -18,8 +18,5 @@ func Deamonize(proc func()) {
 		return
 	}
 	defer context.Release()
-
-	log.Info("daemon started")
-
 	proc()
 }

logger/log.go

@@ -573,12 +573,12 @@ func (cl *CompositeLogger) ClearAllLogFile() error {
 // create a logger for a program with parameters
 //
 func NewLogger(programName string, logFile string, locker sync.Locker, maxBytes int64, backups int, logEventEmitter LogEventEmitter) Logger {
-	files := strings.Split(logFile, ",")
+	files := splitLogFile(logFile)
 	loggers := make([]Logger, 0)
-
+	fmt.Printf("before split:%s\n", logFile)
 	for i, f := range files {
+		fmt.Printf("logFile:-%s-\n", f)
 		var lr Logger
-		f = strings.TrimSpace(f)
 		if i == 0 {
 			lr = createLogger(programName, f, locker, maxBytes, backups, logEventEmitter)
 		} else {
@@ -593,6 +593,14 @@ func NewLogger(programName string, logFile string, locker sync.Locker, maxBytes
 	}
 }
 
+func splitLogFile(logFile string) []string {
+	files := strings.Split(logFile, ",")
+	for i, f := range files {
+		files[i] = strings.TrimSpace(f)
+	}
+	return files
+}
+
 func createLogger(programName string, logFile string, locker sync.Locker, maxBytes int64, backups int, logEventEmitter LogEventEmitter) Logger {
 	if logFile == "/dev/stdout" {
 		return NewStdoutLogger(logEventEmitter)

logger/log_test.go

@@ -12,3 +12,20 @@ func TestWriteSingleLog(t *testing.T) {
 	}
 	logger.Close()
 }
+
+func TestSplitLogFile(t *testing.T) {
+	files := splitLogFile(" test1.log, /dev/stdout, test2.log ")
+	if len(files) != 3 {
+		t.Error("Fail to split log file")
+	}
+	if files[0] != "test1.log" {
+		t.Error("Fail to get first log file")
+	}
+	if files[1] != "/dev/stdout" {
+		t.Error("Fail to get second log file")
+	}
+	if files[2] != "test2.log" {
+		t.Error("Fail to get third log file")
+	}
+
+}

supervisor.go

@@ -492,16 +492,19 @@ func (s *Supervisor) setSupervisordInfo() {
 		if err != nil {
 			logFile, err = process.Path_expand(logFile)
 		}
+		if logFile == "/dev/stdout" {
+			return
+		}
 		logEventEmitter := logger.NewNullLogEventEmitter()
 		s.logger = logger.NewNullLogger(logEventEmitter)
 		if err == nil {
 			logfile_maxbytes := int64(supervisordConf.GetBytes("logfile_maxbytes", 50*1024*1024))
 			logfile_backups := supervisordConf.GetInt("logfile_backups", 10)
 			loglevel := supervisordConf.GetString("loglevel", "info")
 			s.logger = logger.NewLogger("supervisord", logFile, &sync.Mutex{}, logfile_maxbytes, logfile_backups, logEventEmitter)
-			log.SetOutput(s.logger)
 			log.SetLevel(toLogLevel(loglevel))
-			log.SetFormatter(&log.TextFormatter{DisableColors: true})
+			log.SetFormatter(&log.TextFormatter{DisableColors: true, FullTimestamp: true})
+			log.SetOutput(s.logger)
 		}
 		//set the pid
 		pidfile, err := env.Eval(supervisordConf.GetString("pidfile", "supervisord.pid"))