* add request context

* move initialialization to server

* use app interface instead of global app functions

* remove app context from webconn

* cleanup

* remove duplicated services

* move context to separate package

* remove finalize init method and move content to NewServer function

* restart workers and schedulers after adding license for tests

* reflect review comments

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Ibrahim Serdar Acikgoz
2021-05-11 13:00:44 +03:00
коммит произвёл GitHub
родитель c09369f14a
Коммит 5ea06e51d0
235 изменённых файлов: 4048 добавлений и 3819 удалений

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

@@ -10,6 +10,7 @@ import (
"sync"
"time"
"github.com/mattermost/mattermost-server/v5/app/request"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster"
"github.com/mattermost/mattermost-server/v5/shared/i18n"
@@ -140,6 +141,7 @@ func stopTimer(timer *time.Timer) {
// doSync checks the task queue for any tasks to be processed and processes all that are ready.
// If any delayed tasks remain in queue then the duration until the next scheduled task is returned.
func (scs *Service) doSync() time.Duration {
c := request.EmptyContext() // TODO: check this
var task syncTask
var ok bool
var shortestWait time.Duration
@@ -149,7 +151,7 @@ func (scs *Service) doSync() time.Duration {
if !ok {
break
}
if err := scs.processTask(task); err != nil {
if err := scs.processTask(c, task); err != nil {
// put task back into map so it will update again
if task.incRetry() {
scs.addTask(task)
@@ -200,7 +202,7 @@ func (scs *Service) removeOldestTask() (syncTask, bool, time.Duration) {
}
// processTask updates one or more remote clusters with any new channel content.
func (scs *Service) processTask(task syncTask) error {
func (scs *Service) processTask(c *request.Context, task syncTask) error {
var err error
var remotes []*model.RemoteCluster