1 files changed, 85 insertions, 68 deletions
diff --git a/vendor/github.com/mattermost/platform/model/job.go b/vendor/github.com/mattermost/platform/model/job.go
index 09d74aa0..004331a1 100644
--- a/vendor/github.com/mattermost/platform/model/job.go
+++ b/vendor/github.com/mattermost/platform/model/job.go
@@ -1,100 +1,117 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
 package model
 
 import (
-	"fmt"
-	"time"
+	"encoding/json"
+	"io"
+	"net/http"
 )
 
-type TaskFunc func()
+const (
+	JOB_TYPE_DATA_RETENTION              = "data_retention"
+	JOB_TYPE_ELASTICSEARCH_POST_INDEXING = "elasticsearch_post_indexing"
 
-type ScheduledTask struct {
-	Name      string        `json:"name"`
-	Interval  time.Duration `json:"interval"`
-	Recurring bool          `json:"recurring"`
-	function  TaskFunc
-	timer     *time.Timer
-}
-
-var tasks = make(map[string]*ScheduledTask)
-
-func addTask(task *ScheduledTask) {
-	tasks[task.Name] = task
-}
+	JOB_STATUS_PENDING          = "pending"
+	JOB_STATUS_IN_PROGRESS      = "in_progress"
+	JOB_STATUS_SUCCESS          = "success"
+	JOB_STATUS_ERROR            = "error"
+	JOB_STATUS_CANCEL_REQUESTED = "cancel_requested"
+	JOB_STATUS_CANCELED         = "canceled"
+)
 
-func removeTaskByName(name string) {
-	delete(tasks, name)
+type Job struct {
+	Id             string                 `json:"id"`
+	Type           string                 `json:"type"`
+	Priority       int64                  `json:"priority"`
+	CreateAt       int64                  `json:"create_at"`
+	StartAt        int64                  `json:"start_at"`
+	LastActivityAt int64                  `json:"last_activity_at"`
+	Status         string                 `json:"status"`
+	Progress       int64                  `json:"progress"`
+	Data           map[string]interface{} `json:"data"`
 }
 
-func GetTaskByName(name string) *ScheduledTask {
-	if task, ok := tasks[name]; ok {
-		return task
+func (j *Job) IsValid() *AppError {
+	if len(j.Id) != 26 {
+		return NewAppError("Job.IsValid", "model.job.is_valid.id.app_error", nil, "id="+j.Id, http.StatusBadRequest)
 	}
-	return nil
-}
 
-func GetAllTasks() *map[string]*ScheduledTask {
-	return &tasks
-}
-
-func CreateTask(name string, function TaskFunc, timeToExecution time.Duration) *ScheduledTask {
-	task := &ScheduledTask{
-		Name:      name,
-		Interval:  timeToExecution,
-		Recurring: false,
-		function:  function,
+	if j.CreateAt == 0 {
+		return NewAppError("Job.IsValid", "model.job.is_valid.create_at.app_error", nil, "id="+j.Id, http.StatusBadRequest)
 	}
 
-	taskRunner := func() {
-		go task.function()
-		removeTaskByName(task.Name)
+	switch j.Type {
+	case JOB_TYPE_DATA_RETENTION:
+	case JOB_TYPE_ELASTICSEARCH_POST_INDEXING:
+	default:
+		return NewAppError("Job.IsValid", "model.job.is_valid.type.app_error", nil, "id="+j.Id, http.StatusBadRequest)
 	}
 
-	task.timer = time.AfterFunc(timeToExecution, taskRunner)
-
-	addTask(task)
+	switch j.Status {
+	case JOB_STATUS_PENDING:
+	case JOB_STATUS_IN_PROGRESS:
+	case JOB_STATUS_SUCCESS:
+	case JOB_STATUS_ERROR:
+	case JOB_STATUS_CANCEL_REQUESTED:
+	case JOB_STATUS_CANCELED:
+	default:
+		return NewAppError("Job.IsValid", "model.job.is_valid.status.app_error", nil, "id="+j.Id, http.StatusBadRequest)
+	}
 
-	return task
+	return nil
 }
 
-func CreateRecurringTask(name string, function TaskFunc, interval time.Duration) *ScheduledTask {
-	task := &ScheduledTask{
-		Name:      name,
-		Interval:  interval,
-		Recurring: true,
-		function:  function,
+func (js *Job) ToJson() string {
+	if b, err := json.Marshal(js); err != nil {
+		return ""
+	} else {
+		return string(b)
 	}
+}
 
-	taskRecurer := func() {
-		go task.function()
-		task.timer.Reset(task.Interval)
+func JobFromJson(data io.Reader) *Job {
+	var job Job
+	if err := json.NewDecoder(data).Decode(&job); err == nil {
+		return &job
+	} else {
+		return nil
 	}
+}
 
-	task.timer = time.AfterFunc(interval, taskRecurer)
-
-	addTask(task)
+func JobsToJson(jobs []*Job) string {
+	if b, err := json.Marshal(jobs); err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
+}
 
-	return task
+func JobsFromJson(data io.Reader) []*Job {
+	var jobs []*Job
+	if err := json.NewDecoder(data).Decode(&jobs); err == nil {
+		return jobs
+	} else {
+		return nil
+	}
 }
 
-func (task *ScheduledTask) Cancel() {
-	task.timer.Stop()
-	removeTaskByName(task.Name)
+func (js *Job) DataToJson() string {
+	if b, err := json.Marshal(js.Data); err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
 }
 
-// Executes the task immediatly. A recurring task will be run regularally after interval.
-func (task *ScheduledTask) Execute() {
-	task.function()
-	task.timer.Reset(task.Interval)
+type Worker interface {
+	Run()
+	Stop()
+	JobChannel() chan<- Job
 }
 
-func (task *ScheduledTask) String() string {
-	return fmt.Sprintf(
-		"%s\nInterval: %s\nRecurring: %t\n",
-		task.Name,
-		task.Interval.String(),
-		task.Recurring,
-	)
+type Scheduler interface {
+	Run()
+	Stop()
 }