summaryrefslogtreecommitdiffstats
path: root/app/app.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-06-25 12:33:13 -0700
committerGitHub <noreply@github.com>2018-06-25 12:33:13 -0700
commit1e5c432e1029601a664454388ae366ef69618d62 (patch)
treecb9e8bfb66640ac3b29c934bb2c3202d25aeb368 /app/app.go
parentecefa6cdd1e7376046bbec82c1b47f7756fea646 (diff)
downloadchat-1e5c432e1029601a664454388ae366ef69618d62.tar.gz
chat-1e5c432e1029601a664454388ae366ef69618d62.tar.bz2
chat-1e5c432e1029601a664454388ae366ef69618d62.zip
MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)
* Moving plugins to use hashicorp go-plugin. * Tweaks from feedback.
Diffstat (limited to 'app/app.go')
-rw-r--r--app/app.go10
1 files changed, 3 insertions, 7 deletions
diff --git a/app/app.go b/app/app.go
index 2041a24fe..51aa1374e 100644
--- a/app/app.go
+++ b/app/app.go
@@ -24,7 +24,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"
@@ -41,10 +41,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
@@ -231,8 +229,6 @@ func New(options ...Option) (outApp *App, outErr error) {
handlers: make(map[string]webSocketHandler),
}
- app.initBuiltInPlugins()
-
return app, nil
}