Fix review

traefik · Jan 10, 2018 · 168797e · 168797e
1 parent d9654db
commit 168797e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/integration/access_log_test.go b/integration/access_log_test.go
@@ -587,7 +587,7 @@ func checkAccessLogExactValues(c *check.C, line string, i int, v accessLogValue)
 
 func waitForTraefik(c *check.C, containerName string) {
 	// Wait for Traefik to turn ready.
-	req, err := http.NewRequest(http.MethodGet, "http://127.0.0.1:7888/api", nil)
+	req, err := http.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api", nil)
 	c.Assert(err, checker.IsNil)
 
 	err = try.Request(req, 2*time.Second, try.StatusCodeIs(http.StatusOK), try.BodyContains(containerName))

diff --git a/integration/fixtures/access_log_config.toml b/integration/fixtures/access_log_config.toml
@@ -33,11 +33,8 @@ defaultEntryPoints = ["http"]
 
 checkNewVersion = false
 
-################################################################
-# Web configuration backend
-################################################################
-[web]
-  address = ":7888"
+[api]
+  dashboard = false
 
 [docker]
   exposedByDefault = false

diff --git a/integration/fixtures/consul/simple.toml469785378 b/integration/fixtures/consul/simple.toml469785378
diff --git a/integration/fixtures/traefik_log_config.toml b/integration/fixtures/traefik_log_config.toml
@@ -16,8 +16,8 @@ checkNewVersion = false
   [entryPoints.http]
   address = ":8000"
 
-[web]
-  address = ":7888"
+[api]
+  dashboard = false
 
 [docker]
   exposedByDefault = false

diff --git a/server/server.go b/server/server.go
@@ -1110,7 +1110,7 @@ func (s *Server) loadConfig(configurations types.Configurations, globalConfigura
 					}
 
 					if frontend.RateLimit != nil && len(frontend.RateLimit.RateSet) > 0 {
-						lb, err = buildRateLimiter(lb, frontend.RateLimit)
+						lb, err = s.buildRateLimiter(lb, frontend.RateLimit)
 						lb = s.wrapHTTPHandlerWithAccessLog(lb, fmt.Sprintf("rate limit for %s", frontendName))
 						if err != nil {
 							log.Errorf("Error creating rate limiter: %v", err)