Merge pull request #491 from containous/fix-default-weight-in-loadConfig

Fix default weight in server.LoadConfig

glide.yaml

@@ -10,9 +10,9 @@ import:
 - package: github.com/containous/flaeg
   version: b98687da5c323650f4513fda6b6203fcbdec9313
 - package: github.com/vulcand/oxy
-  vcs: git
+  version: b57d6706e9ff606343c596940b60df7f90012d29
   repo: https://github.com/containous/oxy.git
-  version: b57d6706e9ff606343c596940b60df7f90012d29 
+  vcs: git
   subpackages:
   - cbreaker
   - connlimit
@@ -56,7 +56,7 @@ import:
 - package: github.com/thoas/stats
 - package: github.com/unrolled/render
 - package: github.com/vdemeester/docker-events
-- version: 20e6d2db238723e68197a9e3c6c34c99a9893a9c
+  version: 20e6d2db238723e68197a9e3c6c34c99a9893a9c
 - package: github.com/vulcand/vulcand
   subpackages:
   - plugin/rewrite

server.go

@@ -181,6 +181,13 @@ func (server *Server) defaultConfigurationValues(configuration *types.Configurat
 			frontend.EntryPoints = server.globalConfiguration.DefaultEntryPoints
 		}
 	}
+	for backendName, backend := range configuration.Backends {
+		_, err := types.NewLoadBalancerMethod(backend.LoadBalancer)
+		if err != nil {
+			log.Warnf("Error loading load balancer method '%+v' for backend %s: %v. Using default wrr.", backend.LoadBalancer, backendName, err)
+			backend.LoadBalancer = &types.LoadBalancer{Method: "wrr"}
+		}
+	}
 }
 
 func (server *Server) listenConfigurations(stop chan bool) {
@@ -389,7 +396,13 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo
 			frontend := configuration.Frontends[frontendName]
 
 			log.Debugf("Creating frontend %s", frontendName)
-			fwd, _ := forward.New(forward.Logger(oxyLogger), forward.PassHostHeader(frontend.PassHostHeader))
+
+			fwd, err := forward.New(forward.Logger(oxyLogger), forward.PassHostHeader(frontend.PassHostHeader))
+			if err != nil {
+				log.Errorf("Error creating forwarder for frontend %s: %v", frontendName, err)
+				log.Errorf("Skipping frontend %s...", frontendName)
+				continue frontend
+			}
 			saveBackend := middlewares.NewSaveBackend(fwd)
 			if len(frontend.EntryPoints) == 0 {
 				log.Errorf("No entrypoint defined for frontend %s, defaultEntryPoints:%s", frontendName, globalConfiguration.DefaultEntryPoints)
@@ -437,7 +450,9 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo
 						}
 						lbMethod, err := types.NewLoadBalancerMethod(configuration.Backends[frontend.Backend].LoadBalancer)
 						if err != nil {
-							configuration.Backends[frontend.Backend].LoadBalancer = &types.LoadBalancer{Method: "wrr"}
+							log.Errorf("Error loading load balancer method '%+v' for frontend %s: %v", configuration.Backends[frontend.Backend].LoadBalancer, frontendName, err)
+							log.Errorf("Skipping frontend %s...", frontendName)
+							continue frontend
 						}
 						switch lbMethod {
 						case types.Drr: