github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120313 from dairlair/patch-1

Browse Source 
Refactor checkErr func
This commit is contained in:
Kubernetes Prow Robot
2023-08-31 22:02:42 -07:00
committed by GitHub
parent ff5fc28ff3 3c5a58c5f8
commit 83f2d89dc9
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kubeadm/app/util/error.go
View File

@@ -73,10 +73,11 @@ type preflightError interface {
// checkErr formats a given error as a string and calls the passed handleErr // checkErr formats a given error as a string and calls the passed handleErr
// func with that string and an exit code. // func with that string and an exit code.
func checkErr(err error, handleErr func(string, int)) { func checkErr(err error, handleErr func(string, int)) {
if err == nil {
return
}
var msg string msg := fmt.Sprintf("%s\nTo see the stack trace of this error execute with --v=5 or higher", err.Error())
if err != nil {
msg = fmt.Sprintf("%s\nTo see the stack trace of this error execute with --v=5 or higher", err.Error())
// check if the verbosity level in klog is high enough and print a stack trace. // check if the verbosity level in klog is high enough and print a stack trace.
f := flag.CommandLine.Lookup("v") f := flag.CommandLine.Lookup("v")
if f != nil { if f != nil {
@@ -90,11 +91,7 @@ func checkErr(err error, handleErr func(string, int)) {
} }
} }
} }
}
if err == nil {
return
}
switch { switch {
case err == ErrExit: case err == ErrExit:
handleErr("", DefaultErrorExitCode) handleErr("", DefaultErrorExitCode)