Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 20:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1737: Improve logging during import

Browse Source
This commit is contained in:
Jakub
2022-07-15 18:28:15 +02:00
parent 9bb16dec48
commit b3f8866ef7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/imap/mailbox_append.go
View File

@ -197,7 +197,7 @@ func (im *imapMailbox) labelExistingMessage(msg storeMessageProvider) error { //
} }
func (im *imapMailbox) importMessage(kr *crypto.KeyRing, hdr textproto.Header, body []byte, imapFlags []string, date time.Time) error { //nolint:funlen func (im *imapMailbox) importMessage(kr *crypto.KeyRing, hdr textproto.Header, body []byte, imapFlags []string, date time.Time) error { //nolint:funlen
im.log.Info("Importing external message") im.log.WithField("size", len(body)).Info("Importing external message")
var ( var (
seen bool seen bool
@ -251,6 +251,7 @@ func (im *imapMailbox) importMessage(kr *crypto.KeyRing, hdr textproto.Header, b
messageID, err := targetMailbox.ImportMessage(enc, seen, labelIDs, flags, time) messageID, err := targetMailbox.ImportMessage(enc, seen, labelIDs, flags, time)
if err != nil { if err != nil {
log.WithField("enc.size", len(enc)).Error("Import failed")
return err return err
} }

11
pkg/pmapi/import.go
View File

@ -90,7 +90,14 @@ type ImportMsgRes struct {
// Import imports messages to the user's account. // Import imports messages to the user's account.
func (c *client) Import(ctx context.Context, reqs ImportMsgReqs) ([]*ImportMsgRes, error) { func (c *client) Import(ctx context.Context, reqs ImportMsgReqs) ([]*ImportMsgRes, error) {
if len(reqs) == 0 {
return nil, errors.New("missing import requests")
}
if len(reqs) > MaxImportMessageRequestLength { if len(reqs) > MaxImportMessageRequestLength {
log.
WithField("count", len(reqs)).
Warn("Importing too many messages at once.")
return nil, errors.New("request is too long") return nil, errors.New("request is too long")
} }
@ -98,6 +105,10 @@ func (c *client) Import(ctx context.Context, reqs ImportMsgReqs) ([]*ImportMsgRe
for _, req := range reqs { for _, req := range reqs {
remainingSize -= len(req.Message) remainingSize -= len(req.Message)
if remainingSize < 0 { if remainingSize < 0 {
log.
WithField("count", len(reqs)).
WithField("size", MaxImportMessageRequestLength-remainingSize).
Warn("Importing too big message(s)")
return nil, errors.New("request size is too big") return nil, errors.New("request size is too big")
} }
} }