diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-07-10 01:54:25 -0700 |
|---|---|---|
| committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-07-10 10:54:25 +0200 |
| commit | 74e5d8ae66186a82e8afdd845a108d6a662751d7 (patch) | |
| tree | faeeee70a251b636bae0afb4e60c611e00c2cc6b /app/app.go | |
| parent | 951e4ad98401e9828b9941224318f105fb15d500 (diff) | |
| download | chat-74e5d8ae66186a82e8afdd845a108d6a662751d7.tar.gz chat-74e5d8ae66186a82e8afdd845a108d6a662751d7.tar.bz2 chat-74e5d8ae66186a82e8afdd845a108d6a662751d7.zip | |
MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)
* Adding setting to disable email invitations.
* Adding a setting and rate limiting for email invite sending.
* Modifying email rate limit to 20/user/hour
* Adding EnableEmailInvitations to client side config and command.
Diffstat (limited to 'app/app.go')
| -rw-r--r-- | app/app.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/app.go b/app/app.go index 96b9b6d13..6f98d4234 100644 --- a/app/app.go +++ b/app/app.go @@ -17,6 +17,7 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" + "github.com/throttled/throttled" "github.com/mattermost/mattermost-server/einterfaces" ejobs "github.com/mattermost/mattermost-server/einterfaces/jobs" @@ -46,7 +47,8 @@ type App struct { IsPluginSandboxSupported bool pluginStatuses map[string]*model.PluginStatus - EmailBatching *EmailBatchingJob + EmailBatching *EmailBatchingJob + EmailRateLimiter *throttled.GCRARateLimiter Hubs []*Hub HubsStopCheckingForDeadlock chan bool @@ -185,6 +187,10 @@ func New(options ...Option) (outApp *App, outErr error) { }) + if err := app.SetupInviteEmailRateLimiting(); err != nil { + return nil, err + } + mlog.Info("Server is initializing...") app.initEnterprise() |