Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove repeated error stack file lines among stacks for package gerror #2199

Merged
merged 2 commits into from
Oct 13, 2022
+137 −57
Merged

remove repeated error stack file lines among stacks for package gerror #2199

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
398859c
remove repeated error stack file lines among stacks for package gerror
gqcn Oct 13, 2022
d6dff2a
fix nil pointer error for package gerror
gqcn Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix nil pointer error for package gerror
@gqcn
gqcn committed Oct 13, 2022
commit d6dff2af1b07294cf9dd6fee6a06e8141859cae0
5 changes: 4 additions & 1 deletion errors/gerror/gerror_error_stack.go
View file
Original file line number Diff line number Diff line change
@@ -77,6 +77,9 @@ func filterLinesOfStackInfos(infos []*stackInfo) {
)
for i := len(infos) - 1; i >= 0; i-- {
info = infos[i]
if info.Lines == nil {
continue
}
for n, e := 0, info.Lines.Front(); n < info.Lines.Len(); n, e = n+1, e.Next() {
line = e.Value.(*stackLine)
if _, ok = set[line.FileLine]; ok {
@@ -99,7 +102,7 @@ func formatStackInfos(infos []*stackInfo) string {
var buffer = bytes.NewBuffer(nil)
for i, info := range infos {
buffer.WriteString(fmt.Sprintf("%d. %s\n", i+1, info.Message))
if info.Lines.Len() > 0 {
if info.Lines != nil && info.Lines.Len() > 0 {
formatStackLines(buffer, info.Lines)
}
}