* 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 удалений

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

@@ -11,7 +11,6 @@ import (
"github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/configservice"
"github.com/mattermost/mattermost-server/v5/web"
)
@@ -136,16 +135,14 @@ type Routes struct {
}
type API struct {
ConfigService configservice.ConfigService
GetGlobalAppOptions app.AppOptionCreator
BaseRoutes *Routes
app app.AppIface
BaseRoutes *Routes
}
func Init(configservice configservice.ConfigService, globalOptionsFunc app.AppOptionCreator, root *mux.Router) *API {
func Init(a app.AppIface, root *mux.Router) *API {
api := &API{
ConfigService: configservice,
GetGlobalAppOptions: globalOptionsFunc,
BaseRoutes: &Routes{},
app: a,
BaseRoutes: &Routes{},
}
api.BaseRoutes.Root = root
@@ -301,11 +298,10 @@ func Init(configservice configservice.ConfigService, globalOptionsFunc app.AppOp
return api
}
func InitLocal(configservice configservice.ConfigService, globalOptionsFunc app.AppOptionCreator, root *mux.Router) *API {
func InitLocal(a app.AppIface, root *mux.Router) *API {
api := &API{
ConfigService: configservice,
GetGlobalAppOptions: globalOptionsFunc,
BaseRoutes: &Routes{},
app: a,
BaseRoutes: &Routes{},
}
api.BaseRoutes.Root = root
@@ -396,7 +392,7 @@ func InitLocal(configservice configservice.ConfigService, globalOptionsFunc app.
}
func (api *API) Handle404(w http.ResponseWriter, r *http.Request) {
web.Handle404(api.ConfigService, w, r)
web.Handle404(api.app, w, r)
}
var ReturnStatusOK = web.ReturnStatusOK