Move cluster, webhub and store out of Server (#20899)

Этот коммит содержится в:
Ibrahim Serdar Acikgoz
2022-10-06 11:04:21 +03:00
коммит произвёл GitHub
родитель 203df2f537
Коммит 5e69c6b02f
222 изменённых файлов: 9093 добавлений и 7710 удалений

Просмотреть файл

@@ -93,6 +93,7 @@ func (ch *Channels) SetPluginsEnvironment(pluginsEnvironment *plugin.Environment
defer ch.pluginsLock.Unlock()
ch.pluginsEnvironment = pluginsEnvironment
ch.srv.Platform().SetPluginsEnvironment(pluginsEnvironment)
}
func (ch *Channels) syncPluginsActiveState() {
@@ -148,7 +149,7 @@ func (ch *Channels) syncPluginsActiveState() {
if deactivated && plugin.Manifest.HasClient() {
message := model.NewWebSocketEvent(model.WebsocketEventPluginDisabled, "", "", "", nil, "")
message.Add("manifest", plugin.Manifest.ClientManifest())
ch.srv.Publish(message)
ch.srv.platform.Publish(message)
}
}(plugin)
}
@@ -198,6 +199,10 @@ func (a *App) InitPlugins(c *request.Context, pluginDir, webappPluginDir string)
func (ch *Channels) initPlugins(c *request.Context, pluginDir, webappPluginDir string) {
// Acquiring lock manually, as plugins might be disabled. See GetPluginsEnvironment.
defer func() {
ch.srv.Platform().SetPluginsEnvironment(ch.pluginsEnvironment)
}()
ch.pluginsLock.RLock()
pluginsEnvironment := ch.pluginsEnvironment
ch.pluginsLock.RUnlock()
@@ -840,9 +845,9 @@ func (ch *Channels) notifyPluginEnabled(manifest *model.Manifest) error {
var statuses model.PluginStatuses
if ch.srv.Cluster != nil {
if ch.srv.platform.Cluster() != nil {
var err *model.AppError
statuses, err = ch.srv.Cluster.GetPluginStatuses()
statuses, err = ch.srv.platform.Cluster().GetPluginStatuses()
if err != nil {
return err
}
@@ -868,7 +873,7 @@ func (ch *Channels) notifyPluginEnabled(manifest *model.Manifest) error {
// Notify all cluster peer clients.
message := model.NewWebSocketEvent(model.WebsocketEventPluginEnabled, "", "", "", nil, "")
message.Add("manifest", manifest.ClientManifest())
ch.srv.Publish(message)
ch.srv.platform.Publish(message)
return nil
}