Using lastTime

Signed-off-by: Prafulla Mahindrakar <[email protected]>

scheduler/core/gocron_scheduler.go

@@ -110,7 +110,7 @@ func (g *GoCronScheduler) CalculateSnapshot(ctx context.Context) snapshoter.Snap
 
 // ScheduleJob allows to schedule a job using the implemented scheduler
 func (g *GoCronScheduler) ScheduleJob(ctx context.Context, schedule models.SchedulableEntity,
-	funcWithSchedule TimedFuncWithSchedule, lastTime *time.Time) error {
+	funcWithSchedule TimedFuncWithSchedule, lastExecTime *time.Time) error {
 
 	nameOfSchedule := identifier.GetScheduleName(ctx, schedule)
 
@@ -120,11 +120,11 @@ func (g *GoCronScheduler) ScheduleJob(ctx context.Context, schedule models.Sched
 		return nil
 	}
 
-	// Update the catchupFrom time as the lastTime.
-	// Here lastTime is passed to this function only from BootStrapSchedulesFromSnapShot which is during bootup
+	// Update the catchupFrom time as the lastExecTime.
+	// Here lastExecTime is passed to this function only from BootStrapSchedulesFromSnapShot which is during bootup
 	// Once initialized we wont be changing the catchupTime until the next boot
 	job := &GoCronJob{nameOfSchedule: nameOfSchedule, schedule: schedule, funcWithSchedule: funcWithSchedule,
-		catchupFromTime: lastTime, ctx: ctx}
+		catchupFromTime: lastExecTime, lastTime: lastExecTime, ctx: ctx}
 
 	// Define the timed job function to be used for the callback at the scheduled time
 	//jobFunc := job.GetTimedFunc(ctx, g.metrics)
@@ -271,11 +271,11 @@ func (g *GoCronScheduler) AddFixedIntervalJob(ctx context.Context, job *GoCronJo
 	var jobFunc cron.TimedFuncJob
 	jobFunc = job.Run
 
-	var catchupTime time.Time
-	if job.catchupFromTime != nil {
-		catchupTime = *job.catchupFromTime
+	var lastExecTime time.Time
+	if job.lastTime != nil {
+		lastExecTime = *job.lastTime
 	}
-	entryID := g.cron.ScheduleTimedJob(cron.ConstantDelaySchedule{Delay: d}, jobFunc, catchupTime)
+	entryID := g.cron.ScheduleTimedJob(cron.ConstantDelaySchedule{Delay: d}, jobFunc, lastExecTime)
 	// Update the entry id in the job which is handle to be used for removal
 	job.entryID = entryID
 	logger.Infof(ctx, "successfully added the fixed rate schedule %s to the scheduler for schedule %+v",