Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix logger path bug #5836

Merged
merged 2 commits into from Nov 5, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions utils/utils.go
Expand Up @@ -3,8 +3,8 @@ package utils
import (
"database/sql/driver"
"fmt"
"path/filepath"
"reflect"
"regexp"
"runtime"
"strconv"
"strings"
Expand All @@ -16,7 +16,18 @@ var gormSourceDir string
func init() {
_, file, _, _ := runtime.Caller(0)
// compatible solution to get gorm source directory with various operating systems
gormSourceDir = regexp.MustCompile(`gorm.utils.utils\.go`).ReplaceAllString(file, "")
gormSourceDir = sourceDir(file)
}

func sourceDir(file string) string {
dir := filepath.Dir(file)
dir = filepath.Dir(dir)

parent := filepath.Dir(dir)
if filepath.Base(parent) == "gorm.io" {
return parent
}
return dir
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the returned source dir is better to includefilepath.Separator at the end?

Copy link
Contributor Author

@kvii kvii Nov 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not create a new release. There is a bug in windows.

Copy link
Contributor Author

@kvii kvii Nov 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created a new PR #5844 to solve it.

}

// FileWithLineNum return the file name and line number of the current file
Expand Down
33 changes: 33 additions & 0 deletions utils/utils_unix_test.go
@@ -0,0 +1,33 @@
package utils

import "testing"

func TestSourceDir(t *testing.T) {
cases := []struct {
file string
want string
}{
{
file: "/Users/name/go/pkg/mod/gorm.io/gorm@v1.24.1/utils/utils.go",
want: "/Users/name/go/pkg/mod/gorm.io",
},
{
file: "/go/work/proj/gorm/utils/utils.go",
want: "/go/work/proj/gorm",
},
{
file: "/go/work/proj/gorm_alias/utils/utils.go",
want: "/go/work/proj/gorm_alias",
},
{
file: "/go/work/proj/my.gorm.io/gorm@v1.24.1/utils/utils.go",
want: "/go/work/proj/my.gorm.io/gorm@v1.24.1",
},
}
for _, c := range cases {
s := sourceDir(c.file)
if s != c.want {
t.Fatalf("%s: expected %s, got %s", c.file, c.want, s)
}
}
}
33 changes: 33 additions & 0 deletions utils/utils_windows_test.go
@@ -0,0 +1,33 @@
package utils

import "testing"

func TestSourceDir(t *testing.T) {
cases := []struct {
file string
want string
}{
{
file: `C:\Users\name\go\pkg\mod\gorm.io\gorm@v1.20.8\utils\utils.go`,
want: `C:\Users\name\go\pkg\mod\gorm.io`,
},
{
file: `C:\go\work\proj\gorm\utils\utils.go`,
want: `C:\go\work\proj\gorm`,
},
{
file: `C:\go\work\proj\gorm_alias\utils\utils.go`,
want: `C:\go\work\proj\gorm_alias`,
},
{
file: `C:\go\work\proj\my.gorm.io\gorm\utils\utils.go`,
want: `C:\go\work\proj\my.gorm.io\gorm`,
},
}
for _, c := range cases {
s := sourceDir(c.file)
if s != c.want {
t.Fatalf("%s: expected %s, got %s", c.file, c.want, s)
}
}
}