Merge pull request #126 from emilevauge/lock-prepareserver

Add mutex around prepareserver

traefik.go

@@ -26,6 +26,7 @@ import (
 	"github.com/mailgun/oxy/roundrobin"
 	"github.com/thoas/stats"
 	"gopkg.in/alecthomas/kingpin.v2"
+	"sync"
 )
 
 var (
@@ -53,6 +54,7 @@ func main() {
 	defer close(stopChan)
 	var providers = []provider.Provider{}
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	var serverLock sync.Mutex
 
 	// load global configuration
 	globalConfiguration := LoadFileConfig(*globalConfigFile)
@@ -124,6 +126,7 @@ func main() {
 
 				newConfigurationRouter, err := LoadConfig(newConfigurations, globalConfiguration)
 				if err == nil {
+					serverLock.Lock()
 					currentConfigurations = newConfigurations
 					configurationRouter = newConfigurationRouter
 					oldServer := srv
@@ -138,6 +141,7 @@ func main() {
 						log.Info("Stopping old server")
 						oldServer.Close()
 					}
+					serverLock.Unlock()
 				} else {
 					log.Error("Error loading new configuration, aborted ", err)
 				}
@@ -199,11 +203,13 @@ func main() {
 	//negroni.Use(middlewares.NewRoutes(configurationRouter))
 
 	var er error
+	serverLock.Lock()
 	srv, er = prepareServer(configurationRouter, globalConfiguration, nil, loggerMiddleware, metrics)
 	if er != nil {
 		log.Fatal("Error preparing server: ", er)
 	}
 	go startServer(srv, globalConfiguration)
+	serverLock.Unlock()
 
 	<-stopChan
 	log.Info("Shutting down")
@@ -290,7 +296,10 @@ func LoadConfig(configurations configs, globalConfiguration *GlobalConfiguration
 			newRoute := router.NewRoute().Name(frontendName)
 			for routeName, route := range frontend.Routes {
 				log.Debugf("Creating route %s %s:%s", routeName, route.Rule, route.Value)
-				newRouteReflect := Invoke(newRoute, route.Rule, route.Value)
+				newRouteReflect, err := invoke(newRoute, route.Rule, route.Value)
+				if err != nil {
+					return nil, err
+				}
 				newRoute = newRouteReflect[0].Interface().(*mux.Route)
 			}
 			if backends[frontend.Backend] == nil {
@@ -354,10 +363,14 @@ func LoadConfig(configurations configs, globalConfiguration *GlobalConfiguration
 
 // Invoke calls the specified method with the specified arguments on the specified interface.
 // It uses the go(lang) reflect package.
-func Invoke(any interface{}, name string, args ...interface{}) []reflect.Value {
+func invoke(any interface{}, name string, args ...interface{}) ([]reflect.Value, error) {
 	inputs := make([]reflect.Value, len(args))
 	for i := range args {
 		inputs[i] = reflect.ValueOf(args[i])
 	}
-	return reflect.ValueOf(any).MethodByName(name).Call(inputs)
+	method := reflect.ValueOf(any).MethodByName(name)
+	if method.IsValid() {
+		return method.Call(inputs), nil
+	}
+	return nil, errors.New("Method not found: " + name)
 }