Complete context on forwarded local errors

[onechat] / log.go

diff --git a/log.go b/log.go
index 31e17898855d4130dcf08b9f01a6a8ac35db0809..61f4d4c449e97288e92bc3734d5643b512237243 100644 (file)
--- a/log.go
+++ b/log.go
@@ -121,7 +121,7 @@ func (l *Log) catchUp(ctx context.Context) error {
                }
        }
 
-       return l.journal.Scan(ctx, start, func(line []byte, place Position) error {
+       err := l.journal.Scan(ctx, start, func(line []byte, place Position) error {
                var message Message
 
                err := json.Unmarshal(line, &message)
@@ -138,8 +138,18 @@ func (l *Log) catchUp(ctx context.Context) error {
                        return fmt.Errorf("message %d: %w", message.ID, err)
                }
 
-               return l.addIndex(place)
+               err = l.addIndex(place)
+               if err != nil {
+                       return fmt.Errorf("index scanned message: %w", err)
+               }
+
+               return nil
        })
+       if err != nil {
+               return fmt.Errorf("scan message journal: %w", err)
+       }
+
+       return nil
 }
 
 func (l *Log) addIndex(place Position) error {