From 0f3bfd18c3a9ac77a14ff11eb75d268cf0fe1a8f Mon Sep 17 00:00:00 2001 From: little-cui Date: Tue, 12 Dec 2017 17:08:43 +0800 Subject: [PATCH] Optimize log print and make ws requests different from other restful requests. --- server/plugin/infra/registry/embededetcd/embededetcd.go | 1 - server/rest/controller/v4/instance_watcher.go | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/server/plugin/infra/registry/embededetcd/embededetcd.go b/server/plugin/infra/registry/embededetcd/embededetcd.go index 71eb66fa6..5ccb491a6 100644 --- a/server/plugin/infra/registry/embededetcd/embededetcd.go +++ b/server/plugin/infra/registry/embededetcd/embededetcd.go @@ -41,7 +41,6 @@ var embedTLSConfig *tls.Config const START_MANAGER_SERVER_TIMEOUT = 60 func init() { - util.Logger().Infof("embed etcd plugin init.") mgr.RegisterPlugin(mgr.Plugin{mgr.STATIC, mgr.REGISTRY, "embeded_etcd", getEmbedInstance}) } diff --git a/server/rest/controller/v4/instance_watcher.go b/server/rest/controller/v4/instance_watcher.go index f804a2b14..692c704d4 100644 --- a/server/rest/controller/v4/instance_watcher.go +++ b/server/rest/controller/v4/instance_watcher.go @@ -47,6 +47,7 @@ func upgrade(w http.ResponseWriter, r *http.Request) (*websocket.Conn, error) { util.Logger().Error("upgrade failed.", err) // controller.WriteError(w, scerr.ErrInternal, "Upgrade error") } + r.Method = "WEBSOCKET" return conn, err }