[Aishwarya|Jenson] use linux cron format for golang cron

gojek · Jan 24, 2019 · 8e750da · 8e750da
1 parent d092780
commit 8e750da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/proctord/jobs/schedule/handler.go b/proctord/jobs/schedule/handler.go
@@ -102,6 +102,7 @@ func (scheduler *scheduler) Schedule() http.HandlerFunc {
 			return
 		}
 
+		scheduledJob.Time = fmt.Sprintf("0 %s", scheduledJob.Time) 
 		scheduledJob.ID, err = scheduler.store.InsertScheduledJob(scheduledJob.Name, scheduledJob.Tags, scheduledJob.Time, scheduledJob.NotificationEmails, userEmail, scheduledJob.Group, scheduledJob.Args)
 		if err != nil {
 			if strings.Contains(err.Error(), "duplicate key value violates unique constraint") {

diff --git a/proctord/jobs/schedule/handler_test.go b/proctord/jobs/schedule/handler_test.go
@@ -66,7 +66,7 @@ func (suite *SchedulerTestSuite) TestSuccessfulJobScheduling() {
 
 	suite.mockMetadataStore.On("GetJobMetadata", scheduledJob.Name).Return(&metadata.Metadata{}, nil)
 	insertedScheduledJobID := "123"
-	suite.mockStore.On("InsertScheduledJob", scheduledJob.Name, scheduledJob.Tags, scheduledJob.Time, scheduledJob.NotificationEmails, userEmail,scheduledJob.Group, scheduledJob.Args).Return(insertedScheduledJobID, nil)
+	suite.mockStore.On("InsertScheduledJob", scheduledJob.Name, scheduledJob.Tags, "0 * 2 * * *", scheduledJob.NotificationEmails, userEmail,scheduledJob.Group, scheduledJob.Args).Return(insertedScheduledJobID, nil)
 
 	suite.testScheduler.Schedule()(responseRecorder, req)
 
@@ -250,7 +250,7 @@ func (suite *SchedulerTestSuite) TestUniqnessConstrainOnJobNameAndArg() {
 	req := httptest.NewRequest("POST", "/schedule", bytes.NewReader(requestBody))
 
 	suite.mockMetadataStore.On("GetJobMetadata", scheduledJob.Name).Return(&metadata.Metadata{}, nil)
-	suite.mockStore.On("InsertScheduledJob", scheduledJob.Name, scheduledJob.Tags, scheduledJob.Time, scheduledJob.NotificationEmails, "",scheduledJob.Group, scheduledJob.Args).Return("", errors.New("pq: duplicate key value violates unique constraint \"unique_jobs_schedule_name_args\""))
+	suite.mockStore.On("InsertScheduledJob", scheduledJob.Name, scheduledJob.Tags, "0 * 2 * * *", scheduledJob.NotificationEmails, "",scheduledJob.Group, scheduledJob.Args).Return("", errors.New("pq: duplicate key value violates unique constraint \"unique_jobs_schedule_name_args\""))
 
 	suite.testScheduler.Schedule()(responseRecorder, req)
 
@@ -276,7 +276,7 @@ func (suite *SchedulerTestSuite) TestErrorPersistingScheduledJob() {
 	req := httptest.NewRequest("POST", "/schedule", bytes.NewReader(requestBody))
 
 	suite.mockMetadataStore.On("GetJobMetadata", scheduledJob.Name).Return(&metadata.Metadata{}, nil)
-	suite.mockStore.On("InsertScheduledJob", scheduledJob.Name, scheduledJob.Tags, scheduledJob.Time, scheduledJob.NotificationEmails, "",scheduledJob.Group, scheduledJob.Args).Return("", errors.New("any-error"))
+	suite.mockStore.On("InsertScheduledJob", scheduledJob.Name, scheduledJob.Tags, "0 * 2 * * *", scheduledJob.NotificationEmails, "",scheduledJob.Group, scheduledJob.Args).Return("", errors.New("any-error"))
 
 	suite.testScheduler.Schedule()(responseRecorder, req)