From 76bd1bb212177824379c485c553e54530a854009 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Mon, 2 Oct 2017 12:43:21 +0100 Subject: PLT-7705: API to get data retention policy. (#7539) * PLT-7705: API to get data retention policy. * Fix review comments. --- jobs/schedulers.go | 4 ++-- jobs/server.go | 2 +- jobs/workers.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'jobs') diff --git a/jobs/schedulers.go b/jobs/schedulers.go index 2f1ae394f..3d52c969a 100644 --- a/jobs/schedulers.go +++ b/jobs/schedulers.go @@ -35,8 +35,8 @@ func (srv *JobServer) InitSchedulers() *Schedulers { jobs: srv, } - if dataRetentionInterface := srv.DataRetention; dataRetentionInterface != nil { - schedulers.schedulers = append(schedulers.schedulers, dataRetentionInterface.MakeScheduler()) + if srv.DataRetentionJob != nil { + schedulers.schedulers = append(schedulers.schedulers, srv.DataRetentionJob.MakeScheduler()) } if elasticsearchAggregatorInterface := srv.ElasticsearchAggregator; elasticsearchAggregatorInterface != nil { diff --git a/jobs/server.go b/jobs/server.go index 667d6c075..8c5ee807d 100644 --- a/jobs/server.go +++ b/jobs/server.go @@ -17,7 +17,7 @@ type JobServer struct { Workers *Workers Schedulers *Schedulers - DataRetention ejobs.DataRetentionInterface + DataRetentionJob ejobs.DataRetentionJobInterface ElasticsearchAggregator ejobs.ElasticsearchAggregatorInterface ElasticsearchIndexer ejobs.ElasticsearchIndexerInterface LdapSync ejobs.LdapSyncInterface diff --git a/jobs/workers.go b/jobs/workers.go index dfa150ff6..c984a43b8 100644 --- a/jobs/workers.go +++ b/jobs/workers.go @@ -27,8 +27,8 @@ func (srv *JobServer) InitWorkers() *Workers { workers := &Workers{} workers.Watcher = srv.MakeWatcher(workers, DEFAULT_WATCHER_POLLING_INTERVAL) - if dataRetentionInterface := srv.DataRetention; dataRetentionInterface != nil { - workers.DataRetention = dataRetentionInterface.MakeWorker() + if srv.DataRetentionJob != nil { + workers.DataRetention = srv.DataRetentionJob.MakeWorker() } if elasticsearchIndexerInterface := srv.ElasticsearchIndexer; elasticsearchIndexerInterface != nil { -- cgit v1.2.3-1-g7c22