Changeset 515 in code

Timestamp:

May 11, 2021, 10:42:12 AM (4 years ago)

Author:

contact

Message:

Add more context to chathistory errors

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• msgstore_fs.go (modified) (7 diffs)

trunk/downstream.go

@@ -1863 +1863 @@
                 }
                 if err != nil {
-                        dc.logger.Printf("failed parsing log messages for chathistory: %v", err)
+                        dc.logger.Printf("failed fetching %q messages for chathistory: %v", target, err)
                         return newChatHistoryError(subcommand, target)
                 }

trunk/msgstore_fs.go

@@ -81 +81 @@
         offset, err := f.Seek(0, io.SeekEnd)
         if err != nil {
-                return "", err
+                return "", fmt.Errorf("failed to query next FS message ID: %v", err)
         }
         return formatFSMsgID(network.ID, entity, t, offset), nil
@@ -92 +92 @@
                 return formatFSMsgID(network.ID, entity, t, -1), nil
         } else if err != nil {
-                return "", err
+                return "", fmt.Errorf("failed to query last FS message ID: %v", err)
         }
         return formatFSMsgID(network.ID, entity, t, fi.Size()-1), nil
@@ -214 +214 @@
         _, err := fmt.Sscanf(line, "[%02d:%02d:%02d] ", &hour, &minute, &second)
         if err != nil {
-                return nil, time.Time{}, err
+                return nil, time.Time{}, fmt.Errorf("malformed timestamp prefix: %v", err)
         }
         line = line[11:]
@@ -265 +265 @@
                         return nil, nil
                 }
-                return nil, err
+                return nil, fmt.Errorf("failed to parse messages before ref: %v", err)
         }
         defer f.Close()
@@ -295 +295 @@
         }
         if sc.Err() != nil {
-                return nil, sc.Err()
+                return nil, fmt.Errorf("failed to parse messages before ref: scanner error: %v", sc.Err())
         }
 
@@ -321 +321 @@
                         return nil, nil
                 }
-                return nil, err
+                return nil, fmt.Errorf("failed to parse messages after ref: %v", err)
         }
         defer f.Close()
@@ -338 +338 @@
         }
         if sc.Err() != nil {
-                return nil, sc.Err()
+                return nil, fmt.Errorf("failed to parse messages after ref: scanner error: %v", sc.Err())
         }