From 8cb513cb89b4739ccf86bde5bff79264d71a539f Mon Sep 17 00:00:00 2001 From: Alex X Date: Mon, 27 May 2024 20:24:24 +0300 Subject: [PATCH] Add log level for ffmpeg module --- internal/app/app.go | 2 +- internal/ffmpeg/ffmpeg.go | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/internal/app/app.go b/internal/app/app.go index 3ccb5f44..add11dd7 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -120,7 +120,7 @@ func Init() { cfg.Mod = map[string]string{ "format": "color", - "level": zerolog.LevelInfoValue, + "level": "info", "output": "stdout", // TODO: change to stderr someday "time": zerolog.TimeFormatUnixMs, } diff --git a/internal/ffmpeg/ffmpeg.go b/internal/ffmpeg/ffmpeg.go index 2b24c3ce..aeba85fb 100644 --- a/internal/ffmpeg/ffmpeg.go +++ b/internal/ffmpeg/ffmpeg.go @@ -19,15 +19,22 @@ import ( func Init() { var cfg struct { Mod map[string]string `yaml:"ffmpeg"` + Log struct { + Level string `yaml:"ffmpeg"` + } `yaml:"log"` } cfg.Mod = defaults // will be overriden from yaml + cfg.Log.Level = "error" app.LoadConfig(&cfg) - if app.GetLogger("exec").GetLevel() >= 0 { - defaults["global"] += " -v error" + // zerolog levels: trace debug info warn error fatal panic disabled + // FFmpeg levels: trace debug verbose info warning error fatal panic quiet + if cfg.Log.Level == "warn" { + cfg.Log.Level = "warning" } + defaults["global"] += " -v " + cfg.Log.Level streams.RedirectFunc("ffmpeg", func(url string) (string, error) { if _, err := Version(); err != nil {