diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go index e0e8e86..a87337d 100644 --- a/cmd/joj3/main.go +++ b/cmd/joj3/main.go @@ -90,12 +90,12 @@ func mainImpl() (err error) { return err } slog.Info("try to load conf", "path", confPath) - confObj, confName, err := conf.ParseConfFile(confPath) + confObj, err = conf.ParseConfFile(confPath) if err != nil { slog.Error("parse conf", "error", err) return err } - env.Attr.ConfName = confName + env.Attr.ConfName = confObj.Name slog.Debug("conf loaded", "conf", confObj) if err := setupSlog(confObj); err != nil { // after conf is loaded slog.Error("setup slog", "error", err) diff --git a/cmd/repo-health-checker/main.go b/cmd/repo-health-checker/main.go index c6abe22..45a11c8 100644 --- a/cmd/repo-health-checker/main.go +++ b/cmd/repo-health-checker/main.go @@ -84,7 +84,7 @@ func prepareTeapotCheck() ( slog.Error("parse commit msg", "error", err) return } - confObj, _, err = conf.ParseConfFile(confPath) + confObj, err = conf.ParseConfFile(confPath) if err != nil { slog.Error("parse conf", "error", err) return diff --git a/internal/conf/conf.go b/internal/conf/conf.go index cdb05b9..8725c36 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -51,7 +51,7 @@ func ParseConventionalCommit(commit string) (*ConventionalCommit, error) { return cc, nil } -func ParseConfFile(path string) (conf *Conf, name string, err error) { +func ParseConfFile(path string) (conf *Conf, err error) { conf = new(Conf) d := &multiconfig.DefaultLoader{} d.Loader = multiconfig.MultiLoader( @@ -67,7 +67,6 @@ func ParseConfFile(path string) (conf *Conf, name string, err error) { slog.Error("validate stages conf", "error", err) return } - name = conf.Name return }