Merge 27e2f07 into 0d7e986

argoproj · Jul 30, 2019 · 9214332 · 9214332
2 parents 0d7e986 + 27e2f07
commit 9214332
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/gateways/core/calendar/start.go b/gateways/core/calendar/start.go
@@ -102,8 +102,9 @@ func (ese *CalendarEventSourceExecutor) listenEvents(cal *calSchedule, eventSour
 	}
 
 	lastT := time.Now()
+	var location *time.Location
 	if cal.Timezone != "" {
-		location, err := time.LoadLocation(cal.Timezone)
+		location, err = time.LoadLocation(cal.Timezone)
 		if err != nil {
 			errorCh <- err
 			return
@@ -122,6 +123,9 @@ func (ese *CalendarEventSourceExecutor) listenEvents(cal *calSchedule, eventSour
 		select {
 		case tx := <-timer:
 			lastT = tx
+			if location != nil {
+				lastT = lastT.In(location)
+			}
 			response := &calResponse{
 				EventTime:   tx,
 				UserPayload: cal.UserPayload,