refactoring

ROADMAP.md

@@ -2,7 +2,6 @@
 
 * Default configuration values
 * Retry with streams
-* Static files
 * Licence
 * Add traefik.indlude all/enabled policy
 * SSL backends support
@@ -24,3 +23,4 @@
 * ~~Filter no exposed port apps~~
 * ~~Logs~~
 * ~~SSL frontend support~~
+* ~~Static files~~

traefik.go

@@ -15,10 +15,16 @@ import (
 	"github.com/op/go-logging"
 	"github.com/BurntSushi/toml"
 	"github.com/gorilla/handlers"
+	"github.com/unrolled/render"
 )
 
 var currentConfiguration = new(Configuration)
 var log = logging.MustGetLogger("traefik")
+var templatesRenderer = render.New(render.Options{
+	Directory: "templates",
+	Asset: Asset,
+	AssetNames: AssetNames,
+})
 
 func main() {
 	var srv *graceful.Server
@@ -145,7 +151,7 @@ func main() {
 }
 
 func notFoundHandler(w http.ResponseWriter, r *http.Request) {
-	renderer.HTML(w, http.StatusNotFound, "notFound", nil)
+	templatesRenderer.HTML(w, http.StatusNotFound, "notFound", nil)
 }
 
 func LoadDefaultConfig(gloablConfiguration *GlobalConfiguration) *mux.Router {

traefik.toml

@@ -1,8 +1,8 @@
 port = ":8001"
 graceTimeOut = 10
-traefikLogsFile = "log/traefik.log"
+# traefikLogsFile = "log/traefik.log"
 traefikLogsStdout = true
-accessLogsFile = "log/access.log"
+# accessLogsFile = "log/access.log"
 logLevel = "DEBUG"
 
 [docker]

web.go

@@ -3,19 +3,12 @@ package main
 import (
 	"github.com/gorilla/mux"
 	"net/http"
-	"github.com/unrolled/render"
 	"fmt"
 	"io/ioutil"
 	"encoding/json"
 	"github.com/elazarl/go-bindata-assetfs"
 )
 
-var renderer = render.New(render.Options{
-	Directory: "templates",
-	Asset: Asset,
-	AssetNames: AssetNames,
-})
-
 type WebProvider struct {
 	Address string
 }
@@ -47,9 +40,9 @@ func (provider *WebProvider) Provide(configurationChan chan <- *Configuration) {
 }
 
 func GetConfigHandler(rw http.ResponseWriter, r *http.Request) {
-	renderer.JSON(rw, http.StatusOK, currentConfiguration)
+	templatesRenderer.JSON(rw, http.StatusOK, currentConfiguration)
 }
 
 func GetHtmlConfigHandler(response http.ResponseWriter, request *http.Request) {
-	renderer.HTML(response, http.StatusOK, "configuration", Page{Configuration:*currentConfiguration})
+	templatesRenderer.HTML(response, http.StatusOK, "configuration", Page{Configuration:*currentConfiguration})
 }