diff --git a/pkg/httperrors/httperrors.go b/pkg/httperrors/httperrors.go index d34dd572e8..500de5df2f 100644 --- a/pkg/httperrors/httperrors.go +++ b/pkg/httperrors/httperrors.go @@ -1,7 +1,6 @@ package httperrors import ( - "fmt" "net/http" "yunion.io/x/jsonutils" @@ -31,7 +30,7 @@ func GeneralServerError(w http.ResponseWriter, e error) { if ok { JsonClientError(w, je) } else { - InternalServerError(w, fmt.Sprintf("%s", e)) + InternalServerError(w, "%s", e) } } diff --git a/pkg/webconsole/server/server.go b/pkg/webconsole/server/server.go index 5b0dd2fc0a..7028528aba 100644 --- a/pkg/webconsole/server/server.go +++ b/pkg/webconsole/server/server.go @@ -5,7 +5,6 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/pkg/util/sets" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/webconsole/session" @@ -37,13 +36,14 @@ func (s *ConnectionServer) ServeHTTP(w http.ResponseWriter, req *http.Request) { } var srv http.Handler protocol := sessionObj.GetProtocol() - if sets.NewString(session.VNC, session.SPICE, session.WMKS).Has(protocol) { + switch protocol { + case session.VNC, session.SPICE, session.WMKS: srv, err = NewWebsockifyServer(sessionObj) - } else { + default: srv, err = NewTTYServer(sessionObj) } if err != nil { - httperrors.GeneralServerError(w, "New server error: %v", err) + httperrors.GeneralServerError(w, err) return } srv.ServeHTTP(w, req)