black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 00:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix trim package name error (#36)

Browse source
This commit is contained in:
Arthur Morgan 2020-12-05 08:51:36 +08:00 committed by GitHub
parent e3575277ba
commit 32e7cd80e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/errors/errors.go
View file

@ -36,10 +36,12 @@ 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 {
return "" if p := reflect.TypeOf(err.pathObj).PkgPath(); !strings.HasPrefix(p, "main") {
return p[trim:]
}
} }
return reflect.TypeOf(err.pathObj).PkgPath()[trim:] return ""
} }
// Error implements error.Error(). // Error implements error.Error().

4
main/run.go
View file

@ -64,7 +64,7 @@ func executeRun(cmd *base.Command, args []string) {
printVersion() printVersion()
server, err := startXray() server, err := startXray()
if err != nil { if err != nil {
base.Fatalf("Filed to start: %s", err) base.Fatalf("Failed to start: %s", err)
} }
if *test { if *test {
@ -74,7 +74,7 @@ func executeRun(cmd *base.Command, args []string) {
} }
if err := server.Start(); err != nil { if err := server.Start(); err != nil {
base.Fatalf("Filed to start: %s", err) base.Fatalf("Failed to start: %s", err)
} }
defer server.Close() defer server.Close()