JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(cmd/joj3): remove redundant return value
Some checks failed
build / build (push) Failing after 0s
Details
build / trigger-build-image (push) Has been skipped
Details
submodules sync / sync (push) Failing after 0s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-01-29 08:39:30 -05:00
parent b61e2e8464
commit 41734ef5d5
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/joj3/main.go
View File

@ -90,12 +90,12 @@ func mainImpl() (err error) {
return err return err
} }
slog.Info("try to load conf", "path", confPath) slog.Info("try to load conf", "path", confPath)
confObj, confName, err := conf.ParseConfFile(confPath) confObj, err = conf.ParseConfFile(confPath)
if err != nil { if err != nil {
slog.Error("parse conf", "error", err) slog.Error("parse conf", "error", err)
return err return err
} }
env.Attr.ConfName = confName env.Attr.ConfName = confObj.Name
slog.Debug("conf loaded", "conf", confObj) slog.Debug("conf loaded", "conf", confObj)
if err := setupSlog(confObj); err != nil { // after conf is loaded if err := setupSlog(confObj); err != nil { // after conf is loaded
slog.Error("setup slog", "error", err) slog.Error("setup slog", "error", err)

2
cmd/repo-health-checker/main.go
View File

@ -84,7 +84,7 @@ func prepareTeapotCheck() (
slog.Error("parse commit msg", "error", err) slog.Error("parse commit msg", "error", err)
return return
} }
confObj, _, err = conf.ParseConfFile(confPath) confObj, err = conf.ParseConfFile(confPath)
if err != nil { if err != nil {
slog.Error("parse conf", "error", err) slog.Error("parse conf", "error", err)
return return

3
internal/conf/conf.go
View File

@ -51,7 +51,7 @@ func ParseConventionalCommit(commit string) (*ConventionalCommit, error) {
return cc, nil return cc, nil
} }
func ParseConfFile(path string) (conf *Conf, name string, err error) { func ParseConfFile(path string) (conf *Conf, err error) {
conf = new(Conf) conf = new(Conf)
d := &multiconfig.DefaultLoader{} d := &multiconfig.DefaultLoader{}
d.Loader = multiconfig.MultiLoader( 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) slog.Error("validate stages conf", "error", err)
return return
} }
name = conf.Name
return return
} }