homelab/traefik
1
0
Fork 0
Code Activity

Move to containous/oxy, remove websocket specific support

Browse source 
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2016-03-15 23:27:07 +01:00
parent 08d8c334a3
commit 0cbe34eef3
No known key found for this signature in database
GPG key ID: D808B4C167352E59
8 changed files with 266 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server.go
View file

@ -20,14 +20,14 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/codegangsta/negroni"
"github.com/containous/oxy/cbreaker"
"github.com/containous/oxy/forward"
"github.com/containous/oxy/roundrobin"
"github.com/containous/traefik/middlewares"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/types"
"github.com/gorilla/mux"
"github.com/mailgun/manners"
"github.com/mailgun/oxy/cbreaker"
"github.com/mailgun/oxy/forward"
"github.com/mailgun/oxy/roundrobin"
)
var oxyLogger = &OxyLogger{}
@ -379,7 +379,7 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo
}
case types.Wrr:
log.Debugf("Creating load-balancer wrr")
lb = middlewares.NewWebsocketUpgrader(rr)
lb = rr
for serverName, server := range configuration.Backends[frontend.Backend].Servers {
url, err := url.Parse(server.URL)
if err != nil {