purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-25 22:56:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adjust trim package name strategy

Browse Source
This commit is contained in:
RPRX 2020-12-05 04:39:58 +00:00 committed by GitHub
parent 32e7cd80e8
commit 5a43fa750d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/errors/errors.go
View File

@ -36,12 +36,16 @@ func (err *Error) WithPathObj(obj interface{}) *Error {
} }
func (err *Error) pkgPath() string { func (err *Error) pkgPath() string {
if err.pathObj != nil { if err.pathObj == nil {
if p := reflect.TypeOf(err.pathObj).PkgPath(); !strings.HasPrefix(p, "main") {
return p[trim:]
}
}
return "" return ""
}
path := reflect.TypeOf(err.pathObj).PkgPath()
for i := 0; i < len(path); i++ {
if path[i] == '/' {
return path[trim:]
}
}
return path
} }
// Error implements error.Error(). // Error implements error.Error().