sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more context to chathistory errors

Browse Source
This commit is contained in:
Simon Ser 2021-05-11 12:42:12 +02:00
parent 463e234ebc
commit bede274f32
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
downstream.go
View File

@ -1862,7 +1862,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
}} }}
} }
if err != nil { 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) return newChatHistoryError(subcommand, target)
} }

14
msgstore_fs.go
View File

@ -80,7 +80,7 @@ func (ms *fsMessageStore) logPath(network *network, entity string, t time.Time)
func nextFSMsgID(network *network, entity string, t time.Time, f *os.File) (string, error) { func nextFSMsgID(network *network, entity string, t time.Time, f *os.File) (string, error) {
offset, err := f.Seek(0, io.SeekEnd) offset, err := f.Seek(0, io.SeekEnd)
if err != nil { 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 return formatFSMsgID(network.ID, entity, t, offset), nil
} }
@ -91,7 +91,7 @@ func (ms *fsMessageStore) LastMsgID(network *network, entity string, t time.Time
if os.IsNotExist(err) { if os.IsNotExist(err) {
return formatFSMsgID(network.ID, entity, t, -1), nil return formatFSMsgID(network.ID, entity, t, -1), nil
} else if err != 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 return formatFSMsgID(network.ID, entity, t, fi.Size()-1), nil
} }
@ -213,7 +213,7 @@ func parseMessage(line, entity string, ref time.Time) (*irc.Message, time.Time,
var hour, minute, second int var hour, minute, second int
_, err := fmt.Sscanf(line, "[%02d:%02d:%02d] ", &hour, &minute, &second) _, err := fmt.Sscanf(line, "[%02d:%02d:%02d] ", &hour, &minute, &second)
if err != nil { if err != nil {
return nil, time.Time{}, err return nil, time.Time{}, fmt.Errorf("malformed timestamp prefix: %v", err)
} }
line = line[11:] line = line[11:]
@ -264,7 +264,7 @@ func (ms *fsMessageStore) parseMessagesBefore(network *network, entity string, r
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil return nil, nil
} }
return nil, err return nil, fmt.Errorf("failed to parse messages before ref: %v", err)
} }
defer f.Close() defer f.Close()
@ -294,7 +294,7 @@ func (ms *fsMessageStore) parseMessagesBefore(network *network, entity string, r
cur++ cur++
} }
if sc.Err() != nil { if sc.Err() != nil {
return nil, sc.Err() return nil, fmt.Errorf("failed to parse messages before ref: scanner error: %v", sc.Err())
} }
n := limit n := limit
@ -320,7 +320,7 @@ func (ms *fsMessageStore) parseMessagesAfter(network *network, entity string, re
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil return nil, nil
} }
return nil, err return nil, fmt.Errorf("failed to parse messages after ref: %v", err)
} }
defer f.Close() defer f.Close()
@ -337,7 +337,7 @@ func (ms *fsMessageStore) parseMessagesAfter(network *network, entity string, re
history = append(history, msg) history = append(history, msg)
} }
if sc.Err() != nil { if sc.Err() != nil {
return nil, sc.Err() return nil, fmt.Errorf("failed to parse messages after ref: scanner error: %v", sc.Err())
} }
return history, nil return history, nil