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 /jobs/workers.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 'jobs/workers.go')
-rw-r--r-- | jobs/workers.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/jobs/workers.go b/jobs/workers.go index 9f85adaf5..dfa150ff6 100644 --- a/jobs/workers.go +++ b/jobs/workers.go @@ -7,7 +7,6 @@ import ( "sync" l4g "github.com/alecthomas/log4go" - ejobs "github.com/mattermost/mattermost-server/einterfaces/jobs" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -24,23 +23,23 @@ type Workers struct { listenerId string } -func InitWorkers() *Workers { +func (srv *JobServer) InitWorkers() *Workers { workers := &Workers{} - workers.Watcher = MakeWatcher(workers, DEFAULT_WATCHER_POLLING_INTERVAL) + workers.Watcher = srv.MakeWatcher(workers, DEFAULT_WATCHER_POLLING_INTERVAL) - if dataRetentionInterface := ejobs.GetDataRetentionInterface(); dataRetentionInterface != nil { + if dataRetentionInterface := srv.DataRetention; dataRetentionInterface != nil { workers.DataRetention = dataRetentionInterface.MakeWorker() } - if elasticsearchIndexerInterface := ejobs.GetElasticsearchIndexerInterface(); elasticsearchIndexerInterface != nil { + if elasticsearchIndexerInterface := srv.ElasticsearchIndexer; elasticsearchIndexerInterface != nil { workers.ElasticsearchIndexing = elasticsearchIndexerInterface.MakeWorker() } - if elasticsearchAggregatorInterface := ejobs.GetElasticsearchAggregatorInterface(); elasticsearchAggregatorInterface != nil { + if elasticsearchAggregatorInterface := srv.ElasticsearchAggregator; elasticsearchAggregatorInterface != nil { workers.ElasticsearchAggregation = elasticsearchAggregatorInterface.MakeWorker() } - if ldapSyncInterface := ejobs.GetLdapSyncInterface(); ldapSyncInterface != nil { + if ldapSyncInterface := srv.LdapSync; ldapSyncInterface != nil { workers.LdapSync = ldapSyncInterface.MakeWorker() } |