summaryrefslogtreecommitdiff
path: root/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go')
-rw-r--r--vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go b/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go
index d4cec0b88..1e7d3ce0b 100644
--- a/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go
+++ b/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go
@@ -63,7 +63,11 @@ func HandleCrash(additionalHandlers ...func(interface{})) {
// logPanic logs the caller tree when a panic occurs.
func logPanic(r interface{}) {
callers := getCallers(r)
- glog.Errorf("Observed a panic: %#v (%v)\n%v", r, r, callers)
+ if _, ok := r.(string); ok {
+ glog.Errorf("Observed a panic: %s\n%v", r, callers)
+ } else {
+ glog.Errorf("Observed a panic: %#v (%v)\n%v", r, r, callers)
+ }
}
func getCallers(r interface{}) string {