Modifications to rate limiting settings. (#4091)

api/apitestlib.go

@@ -33,7 +33,7 @@ func SetupEnterprise() *TestHelper {
 		utils.LoadConfig("config.json")
 		utils.InitTranslations(utils.Cfg.LocalizationSettings)
 		utils.Cfg.TeamSettings.MaxUsersPerTeam = 50
-		utils.Cfg.RateLimitSettings.EnableRateLimiter = false
+		*utils.Cfg.RateLimitSettings.Enable = false
 		utils.DisableDebugLogForTest()
 		utils.License.Features.SetDefaults()
 		NewServer()
@@ -55,7 +55,7 @@ func Setup() *TestHelper {
 		utils.LoadConfig("config.json")
 		utils.InitTranslations(utils.Cfg.LocalizationSettings)
 		utils.Cfg.TeamSettings.MaxUsersPerTeam = 50
-		utils.Cfg.RateLimitSettings.EnableRateLimiter = false
+		*utils.Cfg.RateLimitSettings.Enable = false
 		utils.DisableDebugLogForTest()
 		NewServer()
 		StartServer()

api/server.go

@@ -4,6 +4,10 @@
 package api
 
 import (
+	"net/http"
+	"strings"
+	"time"
+
 	l4g "github.com/alecthomas/log4go"
 	"github.com/braintree/manners"
 	"github.com/gorilla/handlers"
@@ -12,9 +16,6 @@ import (
 	"github.com/mattermost/platform/utils"
 	"gopkg.in/throttled/throttled.v2"
 	"gopkg.in/throttled/throttled.v2/store/memstore"
-	"net/http"
-	"strings"
-	"time"
 )
 
 type Server struct {
@@ -70,7 +71,7 @@ func StartServer() {
 
 	var handler http.Handler = &CorsWrapper{Srv.Router}
 
-	if utils.Cfg.RateLimitSettings.EnableRateLimiter {
+	if *utils.Cfg.RateLimitSettings.Enable {
 		l4g.Info(utils.T("api.server.start_server.rate.info"))
 
 		store, err := memstore.New(utils.Cfg.RateLimitSettings.MemoryStoreSize)
@@ -81,7 +82,7 @@ func StartServer() {
 
 		quota := throttled.RateQuota{
 			MaxRate:  throttled.PerSec(utils.Cfg.RateLimitSettings.PerSec),
-			MaxBurst: 100,
+			MaxBurst: *utils.Cfg.RateLimitSettings.MaxBurst,
 		}
 
 		rateLimiter, err := throttled.NewGCRARateLimiter(store, quota)