Merge pull request #20 from eosswedenorg/split-logs

Split logs

app/log/HookWriter.go

@@ -0,0 +1,48 @@
+package log
+
+import (
+	"io"
+
+	log "github.com/sirupsen/logrus"
+)
+
+type HookWriter struct {
+	Writer    io.Writer
+	LogLevels []log.Level
+}
+
+func (hook *HookWriter) Fire(entry *log.Entry) error {
+	line, err := entry.String()
+	if err != nil {
+		return err
+	}
+	_, err = hook.Writer.Write([]byte(line))
+	return err
+}
+
+func (hook *HookWriter) Levels() []log.Level {
+	return hook.LogLevels
+}
+
+func MakeStdHook(writer io.Writer) *HookWriter {
+	return &HookWriter{
+		Writer: writer,
+		LogLevels: []log.Level{
+			log.InfoLevel,
+			log.DebugLevel,
+		},
+	}
+}
+
+func MakeErrorHook(writer io.Writer) *HookWriter {
+	return &HookWriter{
+		Writer: writer,
+		LogLevels: []log.Level{
+			log.ErrorLevel,
+			log.WarnLevel,
+			log.FatalLevel,
+			log.PanicLevel,
+			log.TraceLevel,
+		},
+	}
+}

app/log/RotatingFile.go

@@ -46,8 +46,12 @@ func NewRotatingFile(filename string, maxSize int64, maxAge time.Duration) (*Rot
 	}, nil
 }
 
-func NewRotatingFileFromConfig(config Config) (*RotatingFile, error) {
-	return NewRotatingFile(config.GetFilePath(), int64(config.MaxFileSize), config.MaxTime)
+func NewRotatingFileFromConfig(config Config, suffix string) (*RotatingFile, error) {
+	if len(suffix) > 0 {
+		suffix = "_" + suffix
+	}
+
+	return NewRotatingFile(config.GetFilePath()+suffix+".log", int64(config.MaxFileSize), config.MaxTime)
 }
 
 func (w *RotatingFile) newFilename(name string) string {
@@ -58,6 +62,10 @@ func (w *RotatingFile) newFilename(name string) string {
 	return fmt.Sprintf("%s-%s%s", name, time.Now().Format(w.format), ext)
 }
 
+func (w RotatingFile) GetFilename() string {
+	return path.Base(w.fd.Name())
+}
+
 // Rotate the file.
 func (w *RotatingFile) Rotate() error {
 	dst, err := os.OpenFile(w.newFilename(w.fd.Name()), os.O_CREATE|os.O_WRONLY, 0o666)

cmd/thalos/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"os/signal"
 	"path"
@@ -190,18 +191,28 @@ func main() {
 	}
 
 	if len(conf.Log.Filename) > 0 {
-		writer, err := NewRotatingFileFromConfig(conf.Log)
+		stdWriter, err := NewRotatingFileFromConfig(conf.Log, "info")
 		if err != nil {
-			log.WithError(err).Fatal("Failed to open log")
+			log.WithError(err).Fatal("Failed to open info log")
 			return
 		}
+		errWriter, err := NewRotatingFileFromConfig(conf.Log, "error")
+		if err != nil {
+			log.WithError(err).Fatal("Failed to open error log")
+			return
+		}
+
 		log.WithFields(log.Fields{
-			"maxfilesize": conf.Log.MaxFileSize,
-			"maxage":      conf.Log.MaxTime,
-			"directory":   conf.Log.GetDirectory(),
-			"filename":    conf.Log.GetFilename(),
-		}).Info("Logging to file: ", conf.Log.GetFilePath())
-		log.SetOutput(writer)
+			"maxfilesize":    conf.Log.MaxFileSize,
+			"maxage":         conf.Log.MaxTime,
+			"directory":      conf.Log.GetDirectory(),
+			"info_filename":  stdWriter.GetFilename(),
+			"error_filename": errWriter.GetFilename(),
+		}).Info("Logging to file")
+
+		log.SetOutput(io.Discard)
+		log.AddHook(MakeStdHook(stdWriter))
+		log.AddHook(MakeErrorHook(errWriter))
 	}
 
 	// Init telegram notification service

config.example.yml

@@ -9,7 +9,7 @@ message_codec: "json"
 # Logging settings
 log:
   # Filename to use.
-  filename: thalos.log
+  filename: thalos
   # Directory to store the logfiles in.
   directory: logs
   # Format to rename log files when rotating