Move cluster, webhub and store out of Server (#20899)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
203df2f537
Коммит
5e69c6b02f
@@ -44,7 +44,7 @@ func (ch *Channels) getIntegrationsUsage() (*model.IntegrationsUsage, *model.App
|
||||
// GetPostsUsage returns the total posts count rounded down to the most
|
||||
// significant digit
|
||||
func (a *App) GetPostsUsage() (int64, *model.AppError) {
|
||||
count, err := a.Srv().Store.Post().AnalyticsPostCount(&model.PostCountOptions{ExcludeDeleted: true, UsersPostsOnly: true, AllowFromCache: true})
|
||||
count, err := a.Srv().Store().Post().AnalyticsPostCount(&model.PostCountOptions{ExcludeDeleted: true, UsersPostsOnly: true, AllowFromCache: true})
|
||||
if err != nil {
|
||||
return 0, model.NewAppError("GetPostsUsage", "app.post.analytics_posts_count.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
@@ -54,7 +54,7 @@ func (a *App) GetPostsUsage() (int64, *model.AppError) {
|
||||
|
||||
// GetStorageUsage returns the sum of files' sizes stored on this instance
|
||||
func (a *App) GetStorageUsage() (int64, *model.AppError) {
|
||||
usage, err := a.Srv().Store.FileInfo().GetStorageUsage(true, false)
|
||||
usage, err := a.Srv().Store().FileInfo().GetStorageUsage(true, false)
|
||||
if err != nil {
|
||||
return 0, model.NewAppError("GetStorageUsage", "app.usage.get_storage_usage.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
@@ -64,7 +64,7 @@ func (a *App) GetStorageUsage() (int64, *model.AppError) {
|
||||
func (a *App) GetTeamsUsage() (*model.TeamsUsage, *model.AppError) {
|
||||
usage := &model.TeamsUsage{}
|
||||
includeDeleted := false
|
||||
teamCount, err := a.Srv().Store.Team().AnalyticsTeamCount(&model.TeamSearch{IncludeDeleted: &includeDeleted})
|
||||
teamCount, err := a.Srv().Store().Team().AnalyticsTeamCount(&model.TeamSearch{IncludeDeleted: &includeDeleted})
|
||||
if err != nil {
|
||||
return nil, model.NewAppError("GetTeamsUsage", "app.post.analytics_teams_count.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user