Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
5c81571b
Commit
5c81571b
authored
Apr 01, 2019
by
Haowei Cai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use stdlib runtime.Stack instead of customized code
parent
5809b6a4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
19 deletions
+14
-19
runtime.go
staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go
+14
-19
No files found.
staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go
View file @
5c81571b
...
@@ -62,27 +62,18 @@ func HandleCrash(additionalHandlers ...func(interface{})) {
...
@@ -62,27 +62,18 @@ func HandleCrash(additionalHandlers ...func(interface{})) {
// logPanic logs the caller tree when a panic occurs.
// logPanic logs the caller tree when a panic occurs.
func
logPanic
(
r
interface
{})
{
func
logPanic
(
r
interface
{})
{
callers
:=
getCallers
(
r
)
// Same as stdlib http server code. Manually allocate stack trace buffer size
// to prevent excessively large logs
const
size
=
64
<<
10
stacktrace
:=
make
([]
byte
,
size
)
stacktrace
=
stacktrace
[
:
runtime
.
Stack
(
stacktrace
,
false
)]
if
_
,
ok
:=
r
.
(
string
);
ok
{
if
_
,
ok
:=
r
.
(
string
);
ok
{
klog
.
Errorf
(
"Observed a panic: %s
\n
%
v"
,
r
,
callers
)
klog
.
Errorf
(
"Observed a panic: %s
\n
%
s"
,
r
,
stacktrace
)
}
else
{
}
else
{
klog
.
Errorf
(
"Observed a panic: %#v (%v)
\n
%
v"
,
r
,
r
,
callers
)
klog
.
Errorf
(
"Observed a panic: %#v (%v)
\n
%
s"
,
r
,
r
,
stacktrace
)
}
}
}
}
func
getCallers
(
r
interface
{})
string
{
callers
:=
""
for
i
:=
0
;
true
;
i
++
{
_
,
file
,
line
,
ok
:=
runtime
.
Caller
(
i
)
if
!
ok
{
break
}
callers
=
callers
+
fmt
.
Sprintf
(
"%v:%v
\n
"
,
file
,
line
)
}
return
callers
}
// ErrorHandlers is a list of functions which will be invoked when an unreturnable
// ErrorHandlers is a list of functions which will be invoked when an unreturnable
// error occurs.
// error occurs.
// TODO(lavalamp): for testability, this and the below HandleError function
// TODO(lavalamp): for testability, this and the below HandleError function
...
@@ -155,13 +146,17 @@ func GetCaller() string {
...
@@ -155,13 +146,17 @@ func GetCaller() string {
// handlers to handle errors and panics the same way.
// handlers to handle errors and panics the same way.
func
RecoverFromPanic
(
err
*
error
)
{
func
RecoverFromPanic
(
err
*
error
)
{
if
r
:=
recover
();
r
!=
nil
{
if
r
:=
recover
();
r
!=
nil
{
callers
:=
getCallers
(
r
)
// Same as stdlib http server code. Manually allocate stack trace buffer size
// to prevent excessively large logs
const
size
=
64
<<
10
stacktrace
:=
make
([]
byte
,
size
)
stacktrace
=
stacktrace
[
:
runtime
.
Stack
(
stacktrace
,
false
)]
*
err
=
fmt
.
Errorf
(
*
err
=
fmt
.
Errorf
(
"recovered from panic %q. (err=%v) Call stack:
\n
%
v
"
,
"recovered from panic %q. (err=%v) Call stack:
\n
%
s
"
,
r
,
r
,
*
err
,
*
err
,
callers
)
stacktrace
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment