diff options
| author | JoramWilander <jwawilander@gmail.com> | 2018-07-10 15:01:43 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2018-07-10 15:01:43 -0400 |
| commit | 6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005 (patch) | |
| tree | 5564a47257bf6e85aaef711980c5b0fcb4d07dcc /app/app.go | |
| parent | c042ffa460296587579aff54b157a5109e022f7e (diff) | |
| parent | 1e1a5e5e85240f25c4faddcb24c5a29a915fe6e4 (diff) | |
| download | chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.tar.gz chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.tar.bz2 chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.zip | |
Merge branch 'plugins-2'
Diffstat (limited to 'app/app.go')
| -rw-r--r-- | app/app.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/app.go b/app/app.go index 6f98d4234..fb1fc725b 100644 --- a/app/app.go +++ b/app/app.go @@ -25,7 +25,7 @@ import ( tjobs "github.com/mattermost/mattermost-server/jobs/interfaces" "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin/pluginenv" + "github.com/mattermost/mattermost-server/plugin" "github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/mattermost/mattermost-server/utils" @@ -42,10 +42,8 @@ type App struct { Log *mlog.Logger - PluginEnv *pluginenv.Environment - PluginConfigListenerId string - IsPluginSandboxSupported bool - pluginStatuses map[string]*model.PluginStatus + Plugins *plugin.Environment + PluginConfigListenerId string EmailBatching *EmailBatchingJob EmailRateLimiter *throttled.GCRARateLimiter @@ -242,8 +240,6 @@ func New(options ...Option) (outApp *App, outErr error) { handlers: make(map[string]webSocketHandler), } - app.initBuiltInPlugins() - return app, nil } |