From 012df167d5e1b570ccb98eb18fa3757bb234e324 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 8 Apr 2021 18:19:23 +0800 Subject: [PATCH] region: guests: sshable: more friendly fail reason for proxy_forward --- pkg/compute/models/guest_sshable.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/guest_sshable.go b/pkg/compute/models/guest_sshable.go index bed889bcae..a0dbbeff38 100644 --- a/pkg/compute/models/guest_sshable.go +++ b/pkg/compute/models/guest_sshable.go @@ -30,6 +30,7 @@ import ( "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" cloudproxy_module "yunion.io/x/onecloud/pkg/mcclient/modules/cloudproxy" + "yunion.io/x/onecloud/pkg/util/httputils" ssh_util "yunion.io/x/onecloud/pkg/util/ssh" ) @@ -173,9 +174,15 @@ func (guest *SGuest) GetDetailsSshable( } } } else { + var reason string + if jce, ok := err.(*httputils.JSONClientError); ok { + reason = jce.Details + } else { + reason = err.Error() + } tryData.AddMethodTried(compute_api.GuestSshableMethodData{ Method: compute_api.MethodProxyForward, - Reason: err.Error(), + Reason: reason, }) } }