diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-09-03 15:22:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 15:22:16 +0100 |
| commit | 6150de6cb3611ffc61ce10ed6714f65e51e38e78 (patch) | |
| tree | 7c89defb2634b19497f4911e9851f35d8b101af7 /clientapi/routing/profile.go | |
| parent | 74743ac8ae3cc439862acd15d13ba4123d745598 (diff) | |
FIFO ordering of input events (#1386)
* Initial FIFOing of roomserver inputs
* Remove EventID response from api.InputRoomEventsResponse
* Don't send back event ID unnecessarily
* Fix ordering hopefully
* Reduce copies, use buffered task channel to reduce contention on other rooms
* Fix error handling
Diffstat (limited to 'clientapi/routing/profile.go')
| -rw-r--r-- | clientapi/routing/profile.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientapi/routing/profile.go b/clientapi/routing/profile.go index 4c7895bd..bc51b0b5 100644 --- a/clientapi/routing/profile.go +++ b/clientapi/routing/profile.go @@ -171,7 +171,7 @@ func SetAvatarURL( return jsonerror.InternalServerError() } - if _, err := api.SendEvents(req.Context(), rsAPI, events, cfg.Matrix.ServerName, nil); err != nil { + if err := api.SendEvents(req.Context(), rsAPI, events, cfg.Matrix.ServerName, nil); err != nil { util.GetLogger(req.Context()).WithError(err).Error("SendEvents failed") return jsonerror.InternalServerError() } @@ -289,7 +289,7 @@ func SetDisplayName( return jsonerror.InternalServerError() } - if _, err := api.SendEvents(req.Context(), rsAPI, events, cfg.Matrix.ServerName, nil); err != nil { + if err := api.SendEvents(req.Context(), rsAPI, events, cfg.Matrix.ServerName, nil); err != nil { util.GetLogger(req.Context()).WithError(err).Error("SendEvents failed") return jsonerror.InternalServerError() } |