Skip to content

Commit

Permalink
fix: attach stack trace to panic error message
Browse files Browse the repository at this point in the history
Also removes debugging log.

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
  • Loading branch information
smira authored and talos-bot committed Jan 21, 2021
1 parent b64f477 commit b8955a5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 2 additions & 1 deletion pkg/controller/runtime/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"errors"
"fmt"
"log"
"runtime/debug"
"sort"
"time"

Expand Down Expand Up @@ -315,7 +316,7 @@ func (adapter *adapter) runOnce(ctx context.Context, logger *log.Logger) (err er

defer func() {
if p := recover(); p != nil {
err = fmt.Errorf("controller %q panicked: %s", adapter.name, p)
err = fmt.Errorf("controller %q panicked: %s\n\n%s", adapter.name, p, string(debug.Stack()))
}
}()

Expand Down
3 changes: 0 additions & 3 deletions pkg/controller/runtime/dependency/dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package dependency

import (
"fmt"
"log"

"github.com/talos-systems/os-runtime/pkg/controller"
)
Expand All @@ -29,8 +28,6 @@ func Less(a, b *controller.Dependency) bool {
aStr := fmt.Sprintf("%s\000%s\000%s", a.Namespace, a.Type, aID)
bStr := fmt.Sprintf("%s\000%s\000%s", b.Namespace, b.Type, bID)

log.Printf("%q, %q", aStr, bStr)

return aStr < bStr
}

Expand Down

0 comments on commit b8955a5

Please sign in to comment.