summaryrefslogtreecommitdiffhomepage
path: root/pkg/p9
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-06-10 19:40:51 +0000
committergVisor bot <gvisor-bot@google.com>2020-06-10 19:40:51 +0000
commit9d099c6a4f4e91f3b08396958496c92912d19c34 (patch)
tree2d35ba4fede1a8943237d7822d58ac642e5f3f22 /pkg/p9
parentd7d02fe9098f35f1f2024a99b0b203cc2772c608 (diff)
parentfadbfd83d9e7f7b00fcffdaf8532e006327c74ad (diff)
Merge release-20200522.0-118-gfadbfd83d (automated)
Diffstat (limited to 'pkg/p9')
-rw-r--r--pkg/p9/server.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/p9/server.go b/pkg/p9/server.go
index fdfa83648..60cf94fa1 100644
--- a/pkg/p9/server.go
+++ b/pkg/p9/server.go
@@ -482,10 +482,10 @@ func (cs *connState) handle(m message) (r message) {
defer func() {
if r == nil {
// Don't allow a panic to propagate.
- recover()
+ err := recover()
// Include a useful log message.
- log.Warningf("panic in handler: %s", debug.Stack())
+ log.Warningf("panic in handler: %v\n%s", err, debug.Stack())
// Wrap in an EFAULT error; we don't really have a
// better way to describe this kind of error. It will