diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-12-05 13:25:49 -0500 |
|---|---|---|
| committer | Chris <ccbrown112@gmail.com> | 2017-12-05 12:25:49 -0600 |
| commit | 36777057f2b92bd3c0a222f2266eef2cc52f57d7 (patch) | |
| tree | d3df64ec075609078c4f1bc967d07f631d834390 /cmd/platform | |
| parent | 154a502f8e85df2d17f5d439c24fe129ee6be3dd (diff) | |
| download | chat-36777057f2b92bd3c0a222f2266eef2cc52f57d7.tar.gz chat-36777057f2b92bd3c0a222f2266eef2cc52f57d7.tar.bz2 chat-36777057f2b92bd3c0a222f2266eef2cc52f57d7.zip | |
PLT-8289 Added ability to change location of client plugins (#7942)
Diffstat (limited to 'cmd/platform')
| -rw-r--r-- | cmd/platform/server.go | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 51f5fa67e..67e2dcc56 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -75,18 +75,14 @@ func runServer(configFileLocation string) { a.LoadLicense() } - if webappDir, ok := utils.FindDir(model.CLIENT_DIR); ok { - a.InitPlugins(*a.Config().PluginSettings.Directory, webappDir+"/plugins") - utils.AddConfigListener(func(prevCfg, cfg *model.Config) { - if *cfg.PluginSettings.Enable { - a.InitPlugins(*cfg.PluginSettings.Directory, webappDir+"/plugins") - } else { - a.ShutDownPlugins() - } - }) - } else { - l4g.Error("Unable to find webapp directory, could not initialize plugins") - } + a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) + utils.AddConfigListener(func(prevCfg, cfg *model.Config) { + if *cfg.PluginSettings.Enable { + a.InitPlugins(*cfg.PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) + } else { + a.ShutDownPlugins() + } + }) a.StartServer() api4.Init(a, a.Srv.Router, false) |