summaryrefslogtreecommitdiffstats
path: root/cmd/platform/server.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/platform/server.go')
-rw-r--r--cmd/platform/server.go20
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)