Fix (third time!) how session modified_on is checked for session wait…

… expirations and timeouts
nyaruka · Jan 29, 2025 · 27b9a32 · 27b9a32
1 parent 9941120
commit 27b9a32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/tasks/handler/ctasks/wait_expiration.go b/core/tasks/handler/ctasks/wait_expiration.go
@@ -56,7 +56,7 @@ func (t *WaitExpirationTask) Perform(ctx context.Context, rt *runtime.Runtime, o
 		log.Debug("skipping as waiting session has changed")
 		return nil
 	}
-	if !equalToMillis(session.ModifiedOn(), t.ModifiedOn) {
+	if !equalTime(session.ModifiedOn(), t.ModifiedOn) {
 		log.Debug("skipping as session has been modified since", "session_modified_on", session.ModifiedOn(), "task_modified_on", t.ModifiedOn)
 		return nil
 	}
@@ -72,6 +72,6 @@ func (t *WaitExpirationTask) Perform(ctx context.Context, rt *runtime.Runtime, o
 }
 
 // helper to compare two times with millisecond precision - used to compare times that have been in and out of the database
-func equalToMillis(t1, t2 time.Time) bool {
-	return t1.Round(time.Millisecond).Equal(t2.Round(time.Millisecond))
+func equalTime(t1, t2 time.Time) bool {
+	return t1.UnixMilli() == t2.UnixMilli()
 }
diff --git a/core/tasks/handler/ctasks/wait_timeout.go b/core/tasks/handler/ctasks/wait_timeout.go
@@ -59,7 +59,7 @@ func (t *WaitTimeoutTask) Perform(ctx context.Context, rt *runtime.Runtime, oa *
 		log.Debug("skipping as waiting session has changed")
 		return nil
 	}
-	if !equalToMillis(session.ModifiedOn(), t.ModifiedOn) {
+	if !equalTime(session.ModifiedOn(), t.ModifiedOn) {
 		log.Debug("skipping as session has been modified since", "session_modified_on", session.ModifiedOn(), "task_modified_on", t.ModifiedOn)
 		return nil
 	}