mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-09 22:42:58 +00:00
Only return 500 on /send if a database error occurs (#1503)
This commit is contained in:
parent
2bd0449c5b
commit
4df7e345bb
@ -16,6 +16,7 @@ package routing
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"database/sql"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
@ -234,17 +235,10 @@ func (t *txnReq) processTransaction(ctx context.Context) (*gomatrixserverlib.Res
|
|||||||
// we should stop processing the transaction, and returns false if it
|
// we should stop processing the transaction, and returns false if it
|
||||||
// is just some less serious error about a specific event.
|
// is just some less serious error about a specific event.
|
||||||
func isProcessingErrorFatal(err error) bool {
|
func isProcessingErrorFatal(err error) bool {
|
||||||
switch err.(type) {
|
switch err {
|
||||||
case roomNotFoundError:
|
case sql.ErrConnDone:
|
||||||
case *gomatrixserverlib.NotAllowed:
|
case sql.ErrTxDone:
|
||||||
case missingPrevEventsError:
|
return true
|
||||||
default:
|
|
||||||
switch err {
|
|
||||||
case context.Canceled:
|
|
||||||
case context.DeadlineExceeded:
|
|
||||||
default:
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user