diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-29 04:29:29 -0500 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-09-29 10:29:29 +0100 |
commit | 4e79d2d4d037e7c33ec3e63d58110668106de222 (patch) | |
tree | 038995734b4b78cf025b47d2320d7e324eb80e0c /app/app.go | |
parent | cb33179998c682bf1e48795d449d85f92cec97f7 (diff) | |
download | chat-4e79d2d4d037e7c33ec3e63d58110668106de222.tar.gz chat-4e79d2d4d037e7c33ec3e63d58110668106de222.tar.bz2 chat-4e79d2d4d037e7c33ec3e63d58110668106de222.zip |
remove jobs.Srv and other jobs-related globals (#7535)
Diffstat (limited to 'app/app.go')
-rw-r--r-- | app/app.go | 45 |
1 files changed, 44 insertions, 1 deletions
diff --git a/app/app.go b/app/app.go index e85fa6342..26388d841 100644 --- a/app/app.go +++ b/app/app.go @@ -9,6 +9,8 @@ import ( "sync" "github.com/mattermost/mattermost-server/einterfaces" + ejobs "github.com/mattermost/mattermost-server/einterfaces/jobs" + "github.com/mattermost/mattermost-server/jobs" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/plugin/pluginenv" "github.com/mattermost/mattermost-server/utils" @@ -25,6 +27,8 @@ type App struct { Hubs []*Hub HubsStopCheckingForDeadlock chan bool + Jobs *jobs.JobServer + AccountMigration einterfaces.AccountMigrationInterface Brand einterfaces.BrandInterface Cluster einterfaces.ClusterInterface @@ -36,7 +40,9 @@ type App struct { Saml einterfaces.SamlInterface } -var globalApp App +var globalApp App = App{ + Jobs: &jobs.JobServer{}, +} var initEnterprise sync.Once @@ -65,6 +71,30 @@ func RegisterComplianceInterface(f func(*App) einterfaces.ComplianceInterface) { complianceInterface = f } +var jobsDataRetentionInterface func(*App) ejobs.DataRetentionInterface + +func RegisterJobsDataRetentionInterface(f func(*App) ejobs.DataRetentionInterface) { + jobsDataRetentionInterface = f +} + +var jobsElasticsearchAggregatorInterface func(*App) ejobs.ElasticsearchAggregatorInterface + +func RegisterJobsElasticsearchAggregatorInterface(f func(*App) ejobs.ElasticsearchAggregatorInterface) { + jobsElasticsearchAggregatorInterface = f +} + +var jobsElasticsearchIndexerInterface func(*App) ejobs.ElasticsearchIndexerInterface + +func RegisterJobsElasticsearchIndexerInterface(f func(*App) ejobs.ElasticsearchIndexerInterface) { + jobsElasticsearchIndexerInterface = f +} + +var jobsLdapSyncInterface func(*App) ejobs.LdapSyncInterface + +func RegisterJobsLdapSyncInterface(f func(*App) ejobs.LdapSyncInterface) { + jobsLdapSyncInterface = f +} + var ldapInterface func(*App) einterfaces.LdapInterface func RegisterLdapInterface(f func(*App) einterfaces.LdapInterface) { @@ -121,6 +151,19 @@ func (a *App) initEnterprise() { a.Saml.ConfigureSP() }) } + + if jobsDataRetentionInterface != nil { + a.Jobs.DataRetention = jobsDataRetentionInterface(a) + } + if jobsElasticsearchAggregatorInterface != nil { + a.Jobs.ElasticsearchAggregator = jobsElasticsearchAggregatorInterface(a) + } + if jobsElasticsearchIndexerInterface != nil { + a.Jobs.ElasticsearchIndexer = jobsElasticsearchIndexerInterface(a) + } + if jobsLdapSyncInterface != nil { + a.Jobs.LdapSync = jobsLdapSyncInterface(a) + } } func (a *App) Config() *model.Config { |