fixed trimToImportPath for outside of go path (#33)

* fixed trimToImportPath for outside of go path * is this how working_directory works? * is this how working_directory works? * is this how working_directory works? * is THIS how working_directory works? * is THIS how working_directory works? * working_directory * working_directory
eth-classic · May 22, 2019 · ca44ce1 · ca44ce1
1 parent 5c3969f
commit ca44ce1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,7 @@
 version: 2
 jobs:
   build-linux-go-1.12:
+    working_directory: ~/go-ethereum
     docker:
       - image: circleci/golang:1.12
     steps:
@@ -16,6 +17,7 @@ jobs:
           paths:
             - "/go/pkg/mod"
   tests-linux-go-1.12:
+    working_directory: ~/go-ethereum
     docker:
       - image: circleci/golang:1.12
     steps:

diff --git a/logger/glog/glog.go b/logger/glog/glog.go
@@ -234,6 +234,11 @@ var trimPrefixes = []string{
 func trimToImportPath(file string) string {
 	if root := strings.LastIndex(file, "src/"); root != 0 {
 		file = file[root+3:]
+		re := regexp.MustCompile(`^.*\bgo-ethereum\b`)
+		index := re.FindStringIndex(file)
+		if index != nil {
+			file = file[index[1]:]
+		}
 	}
 	return file
 }
@@ -796,6 +801,7 @@ func (l *loggingT) header(s severity, depth int) (*buffer, string, int) {
 		}
 		file = file[1:] // drop '/'
 	}
+
 	return l.formatHeader(s, file, line), file, line
 }