Display containers/image logs

This commit is contained in:
CrazyMax
2019-08-18 22:25:42 +02:00
parent 8887f001b7
commit 817aeaef90

View File

@@ -1,6 +1,7 @@
package logging
import (
"fmt"
"io"
"os"
"time"
@@ -8,6 +9,7 @@ import (
"github.com/crazy-max/diun/internal/model"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/sirupsen/logrus"
)
// Configure configures logger
@@ -41,4 +43,31 @@ func Configure(fl *model.Flags, location *time.Location) {
} else {
zerolog.SetGlobalLevel(logLevel)
}
logrusLevel, err := logrus.ParseLevel(fl.LogLevel)
if err != nil {
log.Fatal().Err(err).Msgf("Unknown log level")
} else {
logrus.SetLevel(logrusLevel)
}
logrus.SetFormatter(new(LogrusFormatter))
}
// LogrusFormatter is a logrus formatter
type LogrusFormatter struct{}
// Format renders a single log entry from logrus entry to zerolog
func (f *LogrusFormatter) Format(entry *logrus.Entry) ([]byte, error) {
message := fmt.Sprintf("[containers/image] %s", entry.Message)
switch entry.Level {
case logrus.ErrorLevel:
log.Error().Fields(entry.Data).Msg(message)
case logrus.WarnLevel:
log.Warn().Fields(entry.Data).Msg(message)
case logrus.DebugLevel:
log.Debug().Fields(entry.Data).Msg(message)
default:
log.Info().Fields(entry.Data).Msg(message)
}
return nil, nil
}