diff --git a/Makefile b/Makefile index 95e32f7..28c97ff 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ build: @# @echo "CGO_CFLAGS is: '$(CGO_CFLAGS)'" @# @echo "CGO_LDFLAGS is: '$(CGO_LDFLAGS)'" @# CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" - go build -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/$(APP_NAME) ./ + go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/$(APP_NAME) ./ run: build @echo "Running!" diff --git a/internal/core/utils/panic.go b/internal/core/utils/panic.go index 0d21bda..fbfc877 100644 --- a/internal/core/utils/panic.go +++ b/internal/core/utils/panic.go @@ -3,38 +3,14 @@ package utils import ( "log" "runtime" - "strings" "golang.org/x/net/context" ) -// temportary solution, pls dont judge -func trimStackPaths(stack []byte, folderName string) []byte { - lines := strings.Split(string(stack), "\n") - for i, line := range lines { - idx := strings.Index(line, folderName) - if idx != -1 { - indentEnd := strings.LastIndex(line[:idx], "\t") - if indentEnd == -1 { - indentEnd = 0 - } else { - indentEnd++ - } - start := idx + len(folderName) + 1 - if start > len(line) { - start = len(line) - } - lines[i] = line[:indentEnd] + line[start:] - } - } - return []byte(strings.Join(lines, "\n")) -} - func CatchPanic() { if err := recover(); err != nil { stack := make([]byte, 8096) stack = stack[:runtime.Stack(stack, false)] - stack = trimStackPaths(stack, "GoSally-mvp") log.Printf("recovered panic:\n%s", stack) } } @@ -43,7 +19,6 @@ func CatchPanicWithCancel(cancel context.CancelFunc) { if err := recover(); err != nil { stack := make([]byte, 8096) stack = stack[:runtime.Stack(stack, false)] - stack = trimStackPaths(stack, "GoSally-mvp") log.Printf("recovered panic:\n%s", stack) cancel() } @@ -53,7 +28,6 @@ func CatchPanicWithFallback(onPanic func(any)) { if err := recover(); err != nil { stack := make([]byte, 8096) stack = stack[:runtime.Stack(stack, false)] - stack = trimStackPaths(stack, "GoSally-mvp") log.Printf("recovered panic:\n%s", stack) onPanic(err) }