diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/admin.go | 3 | ||||
-rw-r--r-- | app/job.go | 16 | ||||
-rw-r--r-- | app/job_test.go | 18 |
3 files changed, 20 insertions, 17 deletions
diff --git a/app/admin.go b/app/admin.go index 8b7d64b53..6fbe150c4 100644 --- a/app/admin.go +++ b/app/admin.go @@ -16,6 +16,7 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" + "github.com/mattermost/platform/jobs" ) func GetLogs(page, perPage int) ([]string, *model.AppError) { @@ -187,6 +188,8 @@ func RecycleDatabaseConnection() { l4g.Warn(utils.T("api.admin.recycle_db_start.warn")) Srv.Store = store.NewLayeredStore() + jobs.Srv.Store = Srv.Store + time.Sleep(20 * time.Second) oldStore.Close() diff --git a/app/job.go b/app/job.go index 00439e4d2..c625ce15f 100644 --- a/app/job.go +++ b/app/job.go @@ -7,22 +7,22 @@ import ( "github.com/mattermost/platform/model" ) -func GetJobStatus(id string) (*model.JobStatus, *model.AppError) { - if result := <-Srv.Store.JobStatus().Get(id); result.Err != nil { +func GetJob(id string) (*model.Job, *model.AppError) { + if result := <-Srv.Store.Job().Get(id); result.Err != nil { return nil, result.Err } else { - return result.Data.(*model.JobStatus), nil + return result.Data.(*model.Job), nil } } -func GetJobStatusesByTypePage(jobType string, page int, perPage int) ([]*model.JobStatus, *model.AppError) { - return GetJobStatusesByType(jobType, page*perPage, perPage) +func GetJobsByTypePage(jobType string, page int, perPage int) ([]*model.Job, *model.AppError) { + return GetJobsByType(jobType, page*perPage, perPage) } -func GetJobStatusesByType(jobType string, offset int, limit int) ([]*model.JobStatus, *model.AppError) { - if result := <-Srv.Store.JobStatus().GetAllByTypePage(jobType, offset, limit); result.Err != nil { +func GetJobsByType(jobType string, offset int, limit int) ([]*model.Job, *model.AppError) { + if result := <-Srv.Store.Job().GetAllByTypePage(jobType, offset, limit); result.Err != nil { return nil, result.Err } else { - return result.Data.([]*model.JobStatus), nil + return result.Data.([]*model.Job), nil } } diff --git a/app/job_test.go b/app/job_test.go index 20e9dee8a..ced65788f 100644 --- a/app/job_test.go +++ b/app/job_test.go @@ -13,17 +13,17 @@ import ( func TestGetJobStatus(t *testing.T) { Setup() - status := &model.JobStatus{ + status := &model.Job{ Id: model.NewId(), Status: model.NewId(), } - if result := <-Srv.Store.JobStatus().SaveOrUpdate(status); result.Err != nil { + if result := <-Srv.Store.Job().Save(status); result.Err != nil { t.Fatal(result.Err) } - defer Srv.Store.JobStatus().Delete(status.Id) + defer Srv.Store.Job().Delete(status.Id) - if received, err := GetJobStatus(status.Id); err != nil { + if received, err := GetJob(status.Id); err != nil { t.Fatal(err) } else if received.Id != status.Id || received.Status != status.Status { t.Fatal("inccorrect job status received") @@ -35,7 +35,7 @@ func TestGetJobStatusesByType(t *testing.T) { jobType := model.NewId() - statuses := []*model.JobStatus{ + statuses := []*model.Job{ { Id: model.NewId(), Type: jobType, @@ -54,11 +54,11 @@ func TestGetJobStatusesByType(t *testing.T) { } for _, status := range statuses { - store.Must(Srv.Store.JobStatus().SaveOrUpdate(status)) - defer Srv.Store.JobStatus().Delete(status.Id) + store.Must(Srv.Store.Job().Save(status)) + defer Srv.Store.Job().Delete(status.Id) } - if received, err := GetJobStatusesByType(jobType, 0, 2); err != nil { + if received, err := GetJobsByType(jobType, 0, 2); err != nil { t.Fatal(err) } else if len(received) != 2 { t.Fatal("received wrong number of statuses") @@ -68,7 +68,7 @@ func TestGetJobStatusesByType(t *testing.T) { t.Fatal("should've received second newest job second") } - if received, err := GetJobStatusesByType(jobType, 2, 2); err != nil { + if received, err := GetJobsByType(jobType, 2, 2); err != nil { t.Fatal(err) } else if len(received) != 1 { t.Fatal("received wrong number of statuses") |