Merge branch 'vdemeester-typos-and-imports'

adapters.go

@@ -38,7 +38,7 @@ func notFoundHandler(w http.ResponseWriter, r *http.Request) {
 	//templatesRenderer.HTML(w, http.StatusNotFound, "notFound", nil)
 }
 
-func LoadDefaultConfig(gloablConfiguration *GlobalConfiguration) *mux.Router {
+func LoadDefaultConfig(globalConfiguration *GlobalConfiguration) *mux.Router {
 	router := mux.NewRouter()
 	router.NotFoundHandler = http.HandlerFunc(notFoundHandler)
 	return router

configuration.go

@@ -31,7 +31,7 @@ type Backend struct {
 }
 
 type Server struct {
-	Url    string
+	URL    string `json:"Url"`
 	Weight int
 }
 

consul.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"bytes"
+	"net/http"
+	"strings"
+	"text/template"
+
 	"github.com/BurntSushi/toml"
 	"github.com/BurntSushi/ty/fun"
 	log "github.com/Sirupsen/logrus"
 	"github.com/hashicorp/consul/api"
-	"net/http"
-	"strings"
-	"text/template"
 )
 
 type Key struct {

docker.go

@@ -3,15 +3,16 @@ package main
 import (
 	"bytes"
 	"errors"
+	"strconv"
+	"strings"
+	"text/template"
+	"time"
+
 	"github.com/BurntSushi/toml"
 	"github.com/BurntSushi/ty/fun"
 	log "github.com/Sirupsen/logrus"
 	"github.com/cenkalti/backoff"
 	"github.com/fsouza/go-dockerclient"
-	"strconv"
-	"strings"
-	"text/template"
-	"time"
 )
 
 type DockerProvider struct {

file.go

@@ -1,12 +1,13 @@
 package main
 
 import (
-	"github.com/BurntSushi/toml"
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/fsnotify.v1"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/BurntSushi/toml"
+	log "github.com/Sirupsen/logrus"
+	"gopkg.in/fsnotify.v1"
 )
 
 type FileProvider struct {

marathon.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"bytes"
+	"strconv"
+	"strings"
+	"text/template"
+
 	"github.com/BurntSushi/toml"
 	"github.com/BurntSushi/ty/fun"
 	log "github.com/Sirupsen/logrus"
 	"github.com/gambol99/go-marathon"
-	"strconv"
-	"strings"
-	"text/template"
 )
 
 type MarathonProvider struct {
@@ -62,10 +63,11 @@ func (provider *MarathonProvider) Provide(configurationChan chan<- *Configuratio
 	config := marathon.NewDefaultConfig()
 	config.URL = provider.Endpoint
 	config.EventsInterface = provider.NetworkInterface
-	if client, err := marathon.NewClient(config); err != nil {
+	client, err := marathon.NewClient(config)
+	if err != nil {
 		log.Errorf("Failed to create a client for marathon, error: %s", err)
 		return
-	} else {
+	}
 	provider.marathonClient = client
 	update := make(marathon.EventsChannel, 5)
 	if provider.Watch {
@@ -88,7 +90,6 @@ func (provider *MarathonProvider) Provide(configurationChan chan<- *Configuratio
 	configuration := provider.loadMarathonConfig()
 	configurationChan <- configuration
 }
-}
 
 func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
 	configuration := new(Configuration)

middlewares/cbreaker.go

@@ -4,8 +4,9 @@ Copyright
 package middlewares
 
 import (
-	"github.com/mailgun/oxy/cbreaker"
 	"net/http"
+
+	"github.com/mailgun/oxy/cbreaker"
 )
 
 type CircuitBreaker struct {

middlewares/logger.go

@@ -4,10 +4,11 @@ Copyright
 package middlewares
 
 import (
-	"github.com/gorilla/handlers"
 	"log"
 	"net/http"
 	"os"
+
+	"github.com/gorilla/handlers"
 )
 
 // Logger is a middleware handler that logs the request as it goes in and the response as it goes out.
@@ -23,9 +24,8 @@ func NewLogger(file string) *Logger {
 			log.Fatal("Error opening file", err)
 		}
 		return &Logger{fi}
-	} else {
-		return &Logger{nil}
 	}
+	return &Logger{nil}
 }
 
 func (l *Logger) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {

middlewares/routes.go

@@ -5,9 +5,10 @@ package middlewares
 
 import (
 	"encoding/json"
-	"github.com/gorilla/mux"
 	"log"
 	"net/http"
+
+	"github.com/gorilla/mux"
 )
 
 type Routes struct {

traefik.go

@@ -1,6 +1,17 @@
 package main
 
 import (
+	fmtlog "log"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"os/signal"
+	"reflect"
+	"strings"
+	"syscall"
+	"time"
+
 	"github.com/BurntSushi/toml"
 	log "github.com/Sirupsen/logrus"
 	"github.com/codegangsta/negroni"
@@ -13,16 +24,6 @@ import (
 	"github.com/tylerb/graceful"
 	"github.com/unrolled/render"
 	"gopkg.in/alecthomas/kingpin.v2"
-	fmtlog "log"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"os/signal"
-	"reflect"
-	"strings"
-	"syscall"
-	"time"
 )
 
 var (
@@ -49,20 +50,20 @@ func main() {
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 
 	// load global configuration
-	gloablConfiguration := LoadFileConfig(*globalConfigFile)
+	globalConfiguration := LoadFileConfig(*globalConfigFile)
 
-	loggerMiddleware := middlewares.NewLogger(gloablConfiguration.AccessLogsFile)
+	loggerMiddleware := middlewares.NewLogger(globalConfiguration.AccessLogsFile)
 	defer loggerMiddleware.Close()
 
 	// logging
-	level, err := log.ParseLevel(strings.ToLower(gloablConfiguration.LogLevel))
+	level, err := log.ParseLevel(strings.ToLower(globalConfiguration.LogLevel))
 	if err != nil {
 		log.Fatal("Error getting level", err)
 	}
 	log.SetLevel(level)
 
-	if len(gloablConfiguration.TraefikLogsFile) > 0 {
+	if len(globalConfiguration.TraefikLogsFile) > 0 {
-		fi, err := os.OpenFile(gloablConfiguration.TraefikLogsFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+		fi, err := os.OpenFile(globalConfiguration.TraefikLogsFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 		defer fi.Close()
 		if err != nil {
 			log.Fatal("Error opening file", err)
@@ -74,7 +75,7 @@ func main() {
 		log.SetFormatter(&log.TextFormatter{FullTimestamp: true, DisableSorting: true})
 	}
 
-	configurationRouter = LoadDefaultConfig(gloablConfiguration)
+	configurationRouter = LoadDefaultConfig(globalConfiguration)
 
 	// listen new configurations from providers
 	go func() {
@@ -86,11 +87,11 @@ func main() {
 			} else if reflect.DeepEqual(currentConfiguration, configuration) {
 				log.Info("Skipping same configuration")
 			} else {
-				newConfigurationRouter, err := LoadConfig(configuration, gloablConfiguration)
+				newConfigurationRouter, err := LoadConfig(configuration, globalConfiguration)
 				if err == nil {
 					currentConfiguration = configuration
 					configurationRouter = newConfigurationRouter
-					srv.Stop(time.Duration(gloablConfiguration.GraceTimeOut) * time.Second)
+					srv.Stop(time.Duration(globalConfiguration.GraceTimeOut) * time.Second)
 					time.Sleep(3 * time.Second)
 				} else {
 					log.Error("Error loading new configuration, aborted ", err)
@@ -100,24 +101,24 @@ func main() {
 	}()
 
 	// configure providers
-	if gloablConfiguration.Docker != nil {
+	if globalConfiguration.Docker != nil {
-		providers = append(providers, gloablConfiguration.Docker)
+		providers = append(providers, globalConfiguration.Docker)
 	}
-	if gloablConfiguration.Marathon != nil {
+	if globalConfiguration.Marathon != nil {
-		providers = append(providers, gloablConfiguration.Marathon)
+		providers = append(providers, globalConfiguration.Marathon)
 	}
-	if gloablConfiguration.File != nil {
+	if globalConfiguration.File != nil {
-		if len(gloablConfiguration.File.Filename) == 0 {
+		if len(globalConfiguration.File.Filename) == 0 {
 			// no filename, setting to global config file
-			gloablConfiguration.File.Filename = *globalConfigFile
+			globalConfiguration.File.Filename = *globalConfigFile
 		}
-		providers = append(providers, gloablConfiguration.File)
+		providers = append(providers, globalConfiguration.File)
 	}
-	if gloablConfiguration.Web != nil {
+	if globalConfiguration.Web != nil {
-		providers = append(providers, gloablConfiguration.Web)
+		providers = append(providers, globalConfiguration.Web)
 	}
-	if gloablConfiguration.Consul != nil {
+	if globalConfiguration.Consul != nil {
-		providers = append(providers, gloablConfiguration.Consul)
+		providers = append(providers, globalConfiguration.Consul)
 	}
 
 	// start providers
@@ -134,7 +135,7 @@ func main() {
 		sig := <-sigs
 		log.Infof("I have to go... %+v", sig)
 		goAway = true
-		srv.Stop(time.Duration(gloablConfiguration.GraceTimeOut) * time.Second)
+		srv.Stop(time.Duration(globalConfiguration.GraceTimeOut) * time.Second)
 	}()
 
 	for {
@@ -151,18 +152,18 @@ func main() {
 		negroni.UseHandler(configurationRouter)
 
 		srv = &graceful.Server{
-			Timeout:          time.Duration(gloablConfiguration.GraceTimeOut) * time.Second,
+			Timeout:          time.Duration(globalConfiguration.GraceTimeOut) * time.Second,
 			NoSignalHandling: true,
 
 			Server: &http.Server{
-				Addr:    gloablConfiguration.Port,
+				Addr:    globalConfiguration.Port,
 				Handler: negroni,
 			},
 		}
 
 		go func() {
-			if len(gloablConfiguration.CertFile) > 0 && len(gloablConfiguration.KeyFile) > 0 {
+			if len(globalConfiguration.CertFile) > 0 && len(globalConfiguration.KeyFile) > 0 {
-				err := srv.ListenAndServeTLS(gloablConfiguration.CertFile, gloablConfiguration.KeyFile)
+				err := srv.ListenAndServeTLS(globalConfiguration.CertFile, globalConfiguration.KeyFile)
 				if err != nil {
 					netOpError, ok := err.(*net.OpError)
 					if ok && netOpError.Err.Error() != "use of closed network connection" {
@@ -185,7 +186,7 @@ func main() {
 	}
 }
 
-func LoadConfig(configuration *Configuration, gloablConfiguration *GlobalConfiguration) (*mux.Router, error) {
+func LoadConfig(configuration *Configuration, globalConfiguration *GlobalConfiguration) (*mux.Router, error) {
 	router := mux.NewRouter()
 	router.NotFoundHandler = http.HandlerFunc(notFoundHandler)
 	backends := map[string]http.Handler{}
@@ -203,18 +204,18 @@ func LoadConfig(configuration *Configuration, gloablConfiguration *GlobalConfigu
 			lb, _ := roundrobin.New(fwd)
 			rb, _ := roundrobin.NewRebalancer(lb, roundrobin.RebalancerLogger(oxyLogger))
 			for serverName, server := range configuration.Backends[frontend.Backend].Servers {
-				if url, err := url.Parse(server.Url); err != nil {
+				url, err := url.Parse(server.URL)
+				if err != nil {
 					return nil, err
-				} else {
+				}
 				log.Debugf("Creating server %s %s", serverName, url.String())
 				rb.UpsertServer(url, roundrobin.Weight(server.Weight))
 			}
-			}
 			backends[frontend.Backend] = rb
 		} else {
 			log.Debugf("Reusing backend %s", frontend.Backend)
 		}
-		//		stream.New(backends[frontend.Backend], stream.Retry("IsNetworkError() && Attempts() <= " + strconv.Itoa(gloablConfiguration.Replay)), stream.Logger(oxyLogger))
+		//		stream.New(backends[frontend.Backend], stream.Retry("IsNetworkError() && Attempts() <= " + strconv.Itoa(globalConfiguration.Replay)), stream.Logger(oxyLogger))
 		var negroni = negroni.New()
 		negroni.Use(middlewares.NewCircuitBreaker(backends[frontend.Backend], cbreaker.Logger(oxyLogger)))
 		newRoute.Handler(negroni)

web.go

@@ -3,11 +3,12 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"net/http"
+
 	log "github.com/Sirupsen/logrus"
 	"github.com/elazarl/go-bindata-assetfs"
 	"github.com/gorilla/mux"
-	"io/ioutil"
-	"net/http"
 )
 
 type WebProvider struct {
@@ -21,7 +22,7 @@ type Page struct {
 
 func (provider *WebProvider) Provide(configurationChan chan<- *Configuration) {
 	systemRouter := mux.NewRouter()
-	systemRouter.Methods("GET").Path("/").Handler(http.HandlerFunc(GetHtmlConfigHandler))
+	systemRouter.Methods("GET").Path("/").Handler(http.HandlerFunc(GetHTMLConfigHandler))
 	systemRouter.Methods("GET").Path("/health").Handler(http.HandlerFunc(GetHealthHandler))
 	systemRouter.Methods("GET").Path("/api").Handler(http.HandlerFunc(GetConfigHandler))
 	systemRouter.Methods("PUT").Path("/api").Handler(http.HandlerFunc(
@@ -64,7 +65,7 @@ func GetConfigHandler(rw http.ResponseWriter, r *http.Request) {
 	templatesRenderer.JSON(rw, http.StatusOK, currentConfiguration)
 }
 
-func GetHtmlConfigHandler(response http.ResponseWriter, request *http.Request) {
+func GetHTMLConfigHandler(response http.ResponseWriter, request *http.Request) {
 	templatesRenderer.HTML(response, http.StatusOK, "configuration", Page{Configuration: *currentConfiguration})
 }