sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Tweak logging

Browse source
This commit is contained in:
Neil Alexander 2020-12-07 09:40:23 +00:00
parent 6029c79dfa
commit 91ac6e9880
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 68 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
federationsender/queue/destinationqueue.go
View file

@ -411,13 +411,13 @@ func (oq *destinationQueue) nextTransaction(
if pduReceipts != nil {
//logrus.Infof("Cleaning PDUs %q", pduReceipt.String())
if err = oq.db.CleanPDUs(context.Background(), oq.destination, pduReceipts); err != nil {
log.WithError(err).Errorf("failed to clean PDUs for server %q", t.Destination)
log.WithError(err).Errorf("Failed to clean PDUs for server %q", t.Destination)
}
}
if eduReceipts != nil {
//logrus.Infof("Cleaning EDUs %q", eduReceipt.String())
if err = oq.db.CleanEDUs(context.Background(), oq.destination, eduReceipts); err != nil {
log.WithError(err).Errorf("failed to clean EDUs for server %q", t.Destination)
log.WithError(err).Errorf("Failed to clean EDUs for server %q", t.Destination)
}
}
return true, len(t.PDUs), len(t.EDUs), nil
@ -429,7 +429,7 @@ func (oq *destinationQueue) nextTransaction(
log.WithFields(log.Fields{
"destination": oq.destination,
log.ErrorKey: err,
}).Info("problem sending transaction")
}).Infof("Failed to send transaction %q", t.TransactionID)
return false, 0, 0, err
}
}

22
federationsender/storage/shared/storage_edus.go
View file

@ -52,11 +52,15 @@ func (d *Database) GetPendingEDUs(
ctx context.Context,
serverName gomatrixserverlib.ServerName,
limit int,
) (map[*Receipt]*gomatrixserverlib.EDU, error) {
edus := make(map[*Receipt]*gomatrixserverlib.EDU)
nids, err := d.FederationSenderQueueEDUs.SelectQueueEDUs(ctx, nil, serverName, limit)
) (
edus map[*Receipt]*gomatrixserverlib.EDU,
err error,
) {
edus = make(map[*Receipt]*gomatrixserverlib.EDU)
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
nids, err := d.FederationSenderQueueEDUs.SelectQueueEDUs(ctx, txn, serverName, limit)
if err != nil {
return nil, fmt.Errorf("SelectQueueEDUs: %w", err)
return fmt.Errorf("SelectQueueEDUs: %w", err)
}
retrieve := make([]int64, 0, len(nids))
@ -68,20 +72,22 @@ func (d *Database) GetPendingEDUs(
}
}
blobs, err := d.FederationSenderQueueJSON.SelectQueueJSON(ctx, nil, retrieve)
blobs, err := d.FederationSenderQueueJSON.SelectQueueJSON(ctx, txn, retrieve)
if err != nil {
return nil, fmt.Errorf("SelectQueueJSON: %w", err)
return fmt.Errorf("SelectQueueJSON: %w", err)
}
for nid, blob := range blobs {
var event gomatrixserverlib.EDU
if err := json.Unmarshal(blob, &event); err != nil {
return nil, fmt.Errorf("json.Unmarshal: %w", err)
return fmt.Errorf("json.Unmarshal: %w", err)
}
edus[&Receipt{nid}] = &event
}
return edus, nil
return nil
})
return
}
// CleanEDUs cleans up all specified EDUs. This is done when a

22
federationsender/storage/shared/storage_pdus.go
View file

@ -53,16 +53,20 @@ func (d *Database) GetPendingPDUs(
ctx context.Context,
serverName gomatrixserverlib.ServerName,
limit int,
) (map[*Receipt]*gomatrixserverlib.HeaderedEvent, error) {
) (
events map[*Receipt]*gomatrixserverlib.HeaderedEvent,
err error,
) {
// Strictly speaking this doesn't need to be using the writer
// since we are only performing selects, but since we don't have
// a guarantee of transactional isolation, it's actually useful
// to know in SQLite mode that nothing else is trying to modify
// the database.
events := make(map[*Receipt]*gomatrixserverlib.HeaderedEvent)
nids, err := d.FederationSenderQueuePDUs.SelectQueuePDUs(ctx, nil, serverName, limit)
events = make(map[*Receipt]*gomatrixserverlib.HeaderedEvent)
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
nids, err := d.FederationSenderQueuePDUs.SelectQueuePDUs(ctx, txn, serverName, limit)
if err != nil {
return nil, fmt.Errorf("SelectQueuePDUs: %w", err)
return fmt.Errorf("SelectQueuePDUs: %w", err)
}
retrieve := make([]int64, 0, len(nids))
@ -74,21 +78,23 @@ func (d *Database) GetPendingPDUs(
}
}
blobs, err := d.FederationSenderQueueJSON.SelectQueueJSON(ctx, nil, retrieve)
blobs, err := d.FederationSenderQueueJSON.SelectQueueJSON(ctx, txn, retrieve)
if err != nil {
return nil, fmt.Errorf("SelectQueueJSON: %w", err)
return fmt.Errorf("SelectQueueJSON: %w", err)
}
for nid, blob := range blobs {
var event gomatrixserverlib.HeaderedEvent
if err := json.Unmarshal(blob, &event); err != nil {
return nil, fmt.Errorf("json.Unmarshal: %w", err)
return fmt.Errorf("json.Unmarshal: %w", err)
}
events[&Receipt{nid}] = &event
d.Cache.StoreFederationSenderQueuedPDU(nid, &event)
}
return events, nil
return nil
})
return
}
// CleanTransactionPDUs cleans up all associated events for a