aboutsummaryrefslogtreecommitdiff
path: root/federationapi/routing/devices.go
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-03-02 16:20:44 +0000
committerGitHub <noreply@github.com>2020-03-02 16:20:44 +0000
commit59a1f4b8ed94267f4b4ad426192879dc3bef4f1e (patch)
tree4cce1217743d5fdadccefcce9e2716464d90d820 /federationapi/routing/devices.go
parent72565f2eeb8988af90590c90c5c8560186db9d62 (diff)
Remove httputil.LogThenError so that the line numbers are reported properly - make error reporting slightly more useful (#879)
Diffstat (limited to 'federationapi/routing/devices.go')
-rw-r--r--federationapi/routing/devices.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go
index 78021c12..01647a61 100644
--- a/federationapi/routing/devices.go
+++ b/federationapi/routing/devices.go
@@ -17,7 +17,6 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
- "github.com/matrix-org/dendrite/clientapi/httputil"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/clientapi/userutil"
"github.com/matrix-org/util"
@@ -43,7 +42,8 @@ func GetUserDevices(
devs, err := deviceDB.GetDevicesByLocalpart(req.Context(), localpart)
if err != nil {
- return httputil.LogThenError(req, err)
+ util.GetLogger(req.Context()).WithError(err).Error("deviceDB.GetDevicesByLocalPart failed")
+ return jsonerror.InternalServerError()
}
return util.JSONResponse{