From 202fe2e8459cae1689a0c026b77be9d49aeb54cd Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 27 Feb 2022 10:24:03 +0100 Subject: [PATCH 1/7] Add `String` method for `RepoUnit` - Add a `String` method for the `RepoUnit`, such as you print it, it will show the repoUnit's type and not the whole struct(if passed as value). - Fixes a issue with a trace of repo.Units whereby it would show the pointers. --- models/repo/repo_unit.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index f526cbdf8b11..c0ea02a6bb45 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -40,6 +40,10 @@ type RepoUnit struct { //revive:disable-line:exported CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"` } +func (repoUnit RepoUnit) String() string { + return repoUnit.Type.String() +} + func init() { db.RegisterModel(new(RepoUnit)) } From 8535f3a70ec37e4cb4c7411ee23b8aabbb53a9fc Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 27 Feb 2022 10:25:58 +0000 Subject: [PATCH 2/7] Update models/repo/repo_unit.go --- models/repo/repo_unit.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index c0ea02a6bb45..d711b0574d96 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -39,9 +39,9 @@ type RepoUnit struct { //revive:disable-line:exported Config convert.Conversion `xorm:"TEXT"` CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"` } - -func (repoUnit RepoUnit) String() string { - return repoUnit.Type.String() +// String returns repoUnit's type. +func (r RepoUnit) String() string { + return r.Type.String() } func init() { From e975f0574bc5f2243c8f0a6680626a405a76a34f Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 27 Feb 2022 10:29:08 +0000 Subject: [PATCH 3/7] fmt --- models/repo/repo_unit.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index d711b0574d96..ffde01b73f07 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -39,6 +39,7 @@ type RepoUnit struct { //revive:disable-line:exported Config convert.Conversion `xorm:"TEXT"` CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"` } + // String returns repoUnit's type. func (r RepoUnit) String() string { return r.Type.String() From 522f6e87870713af5e20749b6c7bfcbb5f21a05f Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 27 Feb 2022 14:49:55 +0100 Subject: [PATCH 4/7] Fix trace call instead --- models/repo/repo.go | 9 ++++++++- models/repo/repo_unit.go | 5 ----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index 28d976773df4..a52a09591fb5 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -290,7 +290,14 @@ func (repo *Repository) LoadUnits(ctx context.Context) (err error) { } repo.Units, err = getUnitsByRepoID(db.GetEngine(ctx), repo.ID) - log.Trace("repo.Units: %-+v", repo.Units) + unitsStr := "[" + for _, unit := range repo.Units { + unitsStr += unit.Type.String() + unitsStr += ", " + } + unitsStr = strings.TrimSuffix(unitsStr, ", ") + unitsStr += "]" + log.Trace("repo.Units: %s", unitsStr) return err } diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index ffde01b73f07..f526cbdf8b11 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -40,11 +40,6 @@ type RepoUnit struct { //revive:disable-line:exported CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"` } -// String returns repoUnit's type. -func (r RepoUnit) String() string { - return r.Type.String() -} - func init() { db.RegisterModel(new(RepoUnit)) } From ec02fb94a50d3201c197115f053fb528416e69c5 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 27 Feb 2022 15:47:15 +0100 Subject: [PATCH 5/7] Only do work when Level is Trace --- models/repo/repo.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index a52a09591fb5..d68837ec85b7 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -290,14 +290,17 @@ func (repo *Repository) LoadUnits(ctx context.Context) (err error) { } repo.Units, err = getUnitsByRepoID(db.GetEngine(ctx), repo.ID) - unitsStr := "[" - for _, unit := range repo.Units { - unitsStr += unit.Type.String() - unitsStr += ", " + if log.GetLevel() >= log.TRACE { + unitsStr := "[" + for _, unit := range repo.Units { + unitsStr += unit.Type.String() + unitsStr += ", " + } + unitsStr = strings.TrimSuffix(unitsStr, ", ") + unitsStr += "]" + log.Trace("repo.Units: %s", unitsStr) } - unitsStr = strings.TrimSuffix(unitsStr, ", ") - unitsStr += "]" - log.Trace("repo.Units: %s", unitsStr) + return err } From 57fe12ecd890499969b635eee728be281e26498e Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 27 Feb 2022 16:31:00 +0100 Subject: [PATCH 6/7] Fixup code --- models/repo/repo.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index d68837ec85b7..0df5e7bc9dae 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -290,15 +290,12 @@ func (repo *Repository) LoadUnits(ctx context.Context) (err error) { } repo.Units, err = getUnitsByRepoID(db.GetEngine(ctx), repo.ID) - if log.GetLevel() >= log.TRACE { - unitsStr := "[" - for _, unit := range repo.Units { - unitsStr += unit.Type.String() - unitsStr += ", " + if log.GetLevel() == log.TRACE { + unitTypeStrings := make([]string, len(repo.Units)) + for i, unit := range repo.Units { + unitTypeStrings[i] = unit.Type.String() } - unitsStr = strings.TrimSuffix(unitsStr, ", ") - unitsStr += "]" - log.Trace("repo.Units: %s", unitsStr) + log.Trace("repo.Units, ID=%d, Types: [%s]", repo.ID, strings.Join(unitTypeStrings, ", ")) } return err From c9433a443bd1995816c6279631eff86192216376 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 27 Feb 2022 16:36:40 +0100 Subject: [PATCH 7/7] Use IsTrace --- models/repo/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index 0df5e7bc9dae..156ead405dea 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -290,7 +290,7 @@ func (repo *Repository) LoadUnits(ctx context.Context) (err error) { } repo.Units, err = getUnitsByRepoID(db.GetEngine(ctx), repo.ID) - if log.GetLevel() == log.TRACE { + if log.IsTrace() { unitTypeStrings := make([]string, len(repo.Units)) for i, unit := range repo.Units { unitTypeStrings[i] = unit.Type.String()