From 32e7cd80e8cf1671fddc7db136dc916a4ae5e11f Mon Sep 17 00:00:00 2001 From: Arthur Morgan Date: Sat, 5 Dec 2020 08:51:36 +0800 Subject: [PATCH] Fix trim package name error (#36) --- common/errors/errors.go | 8 +++++--- main/run.go | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/errors/errors.go b/common/errors/errors.go index bb5ac2c8..8cae8b80 100644 --- a/common/errors/errors.go +++ b/common/errors/errors.go @@ -36,10 +36,12 @@ func (err *Error) WithPathObj(obj interface{}) *Error { } func (err *Error) pkgPath() string { - if err.pathObj == nil { - return "" + if err.pathObj != nil { + 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(). diff --git a/main/run.go b/main/run.go index 1f794cc2..ebcc4b87 100644 --- a/main/run.go +++ b/main/run.go @@ -64,7 +64,7 @@ func executeRun(cmd *base.Command, args []string) { printVersion() server, err := startXray() if err != nil { - base.Fatalf("Filed to start: %s", err) + base.Fatalf("Failed to start: %s", err) } if *test { @@ -74,7 +74,7 @@ func executeRun(cmd *base.Command, args []string) { } if err := server.Start(); err != nil { - base.Fatalf("Filed to start: %s", err) + base.Fatalf("Failed to start: %s", err) } defer server.Close()