Merge pull request #145 from StrongMonkey/update-websocket

fix websocket ping
rancher · Mar 1, 2017 · 186bd03 · 186bd03
2 parents f0e1ec2 + 5f3cb6c
commit 186bd03
Show file tree

Hide file tree

Showing 19 changed files with 1,104 additions and 45 deletions.
diff --git a/service/hostapi/testutils/utils.go b/service/hostapi/testutils/utils.go
@@ -28,6 +28,7 @@ func ParseTestPrivateKey() interface{} {
 func GetTestConfig(addr string) *proxy.Config {
 	config := &proxy.Config{
 		ListenAddr: addr,
+		CattleAddr: "127.0.0.1:8081",
 	}
 
 	pubKey, err := proxy.ParsePublicKey("../testutils/public.pem")

diff --git a/trash.yml b/trash.yml
@@ -84,7 +84,7 @@ import:
   version: 415abc325023f1a00cd2d9fa512e0e71745791a2
 
 - package: github.com/rancher/websocket-proxy
-  version: 846935d828eb7762562270ad5855029d422745c5
+  version: 4b6c147a7434c740067e7613002d87977c029fa2
 
 - package: github.com/rakyll/goini
   version: 907cca0f578a5316fb864ec6992dc3d9730ec58c

diff --git a/vendor/github.com/rancher/websocket-proxy/.drone.yml b/vendor/github.com/rancher/websocket-proxy/.drone.yml
diff --git a/vendor/github.com/rancher/websocket-proxy/backend/pong_handler.go b/vendor/github.com/rancher/websocket-proxy/backend/pong_handler.go
diff --git a/vendor/github.com/rancher/websocket-proxy/proxy/apiinterceptor/filters/api_filter.go b/vendor/github.com/rancher/websocket-proxy/proxy/apiinterceptor/filters/api_filter.go
diff --git a/...ancher/websocket-proxy/proxy/apiinterceptor/filters/auth/rancher_token_validate_filter.go b/...ancher/websocket-proxy/proxy/apiinterceptor/filters/auth/rancher_token_validate_filter.go