tweak verbiage

Author: FGasper

internal/verifier/change_stream.go

@@ -138,7 +138,7 @@ func (verifier *Verifier) iterateChangeStream(ctx context.Context, cs *mongo.Cha
 		return err
 	}
 
-	readAndHandleOneChangeEventBatch := func() (bool, error) {
+	readAndHandleOneChangeEventBatch := func() error {
 		eventsRead := 0
 		var changeEventBatch []ParsedEvent
 
@@ -154,27 +154,27 @@ func (verifier *Verifier) iterateChangeStream(ctx context.Context, cs *mongo.Cha
 			}
 
 			if err := cs.Decode(&changeEventBatch[eventsRead]); err != nil {
-				return false, errors.Wrap(err, "failed to decode change event")
+				return errors.Wrap(err, "failed to decode change event")
 			}
 
 			eventsRead++
 		}
 
 		if cs.Err() != nil {
-			return false, errors.Wrap(cs.Err(), "change stream iteration failed")
+			return errors.Wrap(cs.Err(), "change stream iteration failed")
 		}
 
 		if eventsRead == 0 {
-			return false, nil
+			return nil
 		}
 
 		verifier.logger.Debug().Int("eventsCount", eventsRead).Msgf("Received a batch of events.")
 		err := verifier.HandleChangeStreamEvents(ctx, changeEventBatch)
 		if err != nil {
-			return false, errors.Wrap(err, "failed to handle change events")
+			return errors.Wrap(err, "failed to handle change events")
 		}
 
-		return true, nil
+		return nil
 	}
 
 	for {
@@ -216,19 +216,19 @@ func (verifier *Verifier) iterateChangeStream(ctx context.Context, cs *mongo.Cha
 					break
 				}
 
-				_, err = readAndHandleOneChangeEventBatch()
+				err = readAndHandleOneChangeEventBatch()
 
 				if err != nil {
 					break
 				}
 			}
 
 		default:
-			_, err = readAndHandleOneChangeEventBatch()
-		}
+			err = readAndHandleOneChangeEventBatch()
 
-		if err == nil {
-			err = persistResumeTokenIfNeeded()
+			if err == nil {
+				err = persistResumeTokenIfNeeded()
+			}
 		}
 
 		if err != nil && !errors.Is(err, context.Canceled) {
@@ -259,9 +259,9 @@ func (verifier *Verifier) iterateChangeStream(ctx context.Context, cs *mongo.Cha
 
 	infoLog := verifier.logger.Info()
 	if verifier.lastChangeEventTime == nil {
-		infoLog = infoLog.Str("changeStreamStopTime", "none")
+		infoLog = infoLog.Str("lastEventTime", "none")
 	} else {
-		infoLog = infoLog.Interface("changeStreamStopTime", *verifier.lastChangeEventTime)
+		infoLog = infoLog.Interface("lastEventTime", *verifier.lastChangeEventTime)
 	}
 
 	infoLog.Msg("Change stream is done.")