mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 05:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Still write events into database for blacklisted hosts (they can be tidied up later)

Browse source
This commit is contained in:
Neil Alexander 2020-07-22 15:48:35 +01:00
parent dd7df49d6a
commit 213ca2d039
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
federationsender/queue/destinationqueue.go
View file

@ -66,11 +66,6 @@ type destinationQueue struct {
// If the queue is empty then it starts a background goroutine to // If the queue is empty then it starts a background goroutine to
// start sending events to that destination. // start sending events to that destination.
func (oq *destinationQueue) sendEvent(receipt *shared.Receipt) { func (oq *destinationQueue) sendEvent(receipt *shared.Receipt) {
if oq.statistics.Blacklisted() {
// If the destination is blacklisted then drop the event.
log.Infof("%s is blacklisted; dropping event", oq.destination)
return
}
// Create a transaction ID. We'll either do this if we don't have // Create a transaction ID. We'll either do this if we don't have
// one made up yet, or if we've exceeded the number of maximum // one made up yet, or if we've exceeded the number of maximum
// events allowed in a single tranaction. We'll reset the counter // events allowed in a single tranaction. We'll reset the counter
@ -97,13 +92,17 @@ func (oq *destinationQueue) sendEvent(receipt *shared.Receipt) {
// We've successfully added a PDU to the transaction so increase // We've successfully added a PDU to the transaction so increase
// the counter. // the counter.
oq.transactionCount.Add(1) oq.transactionCount.Add(1)
// Wake up the queue if it's asleep. // Check if the destination is blacklisted. If it isn't then wake
oq.wakeQueueIfNeeded() // up the queue.
// If we're blocking on waiting PDUs then tell the queue that we if !oq.statistics.Blacklisted() {
// have work to do. // Wake up the queue if it's asleep.
select { oq.wakeQueueIfNeeded()
case oq.notifyPDUs <- true: // If we're blocking on waiting PDUs then tell the queue that we
default: // have work to do.
select {
case oq.notifyPDUs <- true:
default:
}
} }
} }
@ -111,11 +110,6 @@ func (oq *destinationQueue) sendEvent(receipt *shared.Receipt) {
// If the queue is empty then it starts a background goroutine to // If the queue is empty then it starts a background goroutine to
// start sending events to that destination. // start sending events to that destination.
func (oq *destinationQueue) sendEDU(receipt *shared.Receipt) { func (oq *destinationQueue) sendEDU(receipt *shared.Receipt) {
if oq.statistics.Blacklisted() {
// If the destination is blacklisted then drop the event.
log.Infof("%s is blacklisted; dropping ephemeral event", oq.destination)
return
}
// Create a database entry that associates the given PDU NID with // Create a database entry that associates the given PDU NID with
// this destination queue. We'll then be able to retrieve the PDU // this destination queue. We'll then be able to retrieve the PDU
// later. // later.
@ -130,13 +124,17 @@ func (oq *destinationQueue) sendEDU(receipt *shared.Receipt) {
// We've successfully added an EDU to the transaction so increase // We've successfully added an EDU to the transaction so increase
// the counter. // the counter.
oq.transactionCount.Add(1) oq.transactionCount.Add(1)
// Wake up the queue if it's asleep. // Check if the destination is blacklisted. If it isn't then wake
oq.wakeQueueIfNeeded() // up the queue.
// If we're blocking on waiting PDUs then tell the queue that we if !oq.statistics.Blacklisted() {
// have work to do. // Wake up the queue if it's asleep.
select { oq.wakeQueueIfNeeded()
case oq.notifyEDUs <- true: // If we're blocking on waiting EDUs then tell the queue that we
default: // have work to do.
select {
case oq.notifyEDUs <- true:
default:
}
} }
} }