github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1857 from deads2k/dev/deads/fixup-error-reporting 

report originating error for GetReference failure
pull/6/head
Daniel Smith 2014-10-17 10:44:34 -07:00
parent ea3d3c06b9 2c35c06727
commit 34a64a270d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/handlers.go
View File

@ -34,7 +34,7 @@ func RecoverPanics(handler http.Handler) http.Handler {
if x := recover(); x != nil {
w.WriteHeader(http.StatusInternalServerError)
fmt.Fprint(w, "apis panic. Look in log for details.")
glog.Infof("APIServer panic'd on %v %v: %#v\n%s\n", req.Method, req.RequestURI, x, debug.Stack())
glog.Infof("APIServer panic'd on %v %v: %v\n%s\n", req.Method, req.RequestURI, x, debug.Stack())
}
}()
defer httplog.NewLogged(req, &w).StacktraceWhen(

2
pkg/client/record/event.go
View File

@ -99,7 +99,7 @@ var events = watch.NewMux(queueLen)
func Event(object runtime.Object, fieldPath, status, reason, message string) {
ref, err := api.GetReference(object)
if err != nil {
glog.Errorf("Could not construct reference to: %#v", object)
glog.Errorf("Could not construct reference to: %#v due to: %v", object, err)
return
}
ref.FieldPath = fieldPath