diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-06-25 12:33:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 12:33:13 -0700 |
| commit | 1e5c432e1029601a664454388ae366ef69618d62 (patch) | |
| tree | cb9e8bfb66640ac3b29c934bb2c3202d25aeb368 /cmd | |
| parent | ecefa6cdd1e7376046bbec82c1b47f7756fea646 (diff) | |
| download | chat-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 'cmd')
| -rw-r--r-- | cmd/mattermost/commands/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 10b44ad83..9da8ecec0 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -98,10 +98,10 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform a.DoAdvancedPermissionsMigration() a.DoEmojisPermissionsMigration() - a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory, nil) + a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) a.AddConfigListener(func(prevCfg, cfg *model.Config) { if *cfg.PluginSettings.Enable { - a.InitPlugins(*cfg.PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory, nil) + a.InitPlugins(*cfg.PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) } else { a.ShutDownPlugins() } |