aboutsummaryrefslogtreecommitdiff
path: root/clientapi/auth
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 /clientapi/auth
parent72565f2eeb8988af90590c90c5c8560186db9d62 (diff)
Remove httputil.LogThenError so that the line numbers are reported properly - make error reporting slightly more useful (#879)
Diffstat (limited to 'clientapi/auth')
-rw-r--r--clientapi/auth/auth.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/clientapi/auth/auth.go b/clientapi/auth/auth.go
index f51cfea2..87a2f667 100644
--- a/clientapi/auth/auth.go
+++ b/clientapi/auth/auth.go
@@ -26,7 +26,6 @@ import (
"github.com/matrix-org/dendrite/appservice/types"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
- "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/dendrite/common/config"
@@ -166,7 +165,8 @@ func verifyAccessToken(req *http.Request, deviceDB DeviceDatabase) (device *auth
JSON: jsonerror.UnknownToken("Unknown token"),
}
} else {
- jsonErr := httputil.LogThenError(req, err)
+ util.GetLogger(req.Context()).WithError(err).Error("deviceDB.GetDeviceByAccessToken failed")
+ jsonErr := jsonerror.InternalServerError()
resErr = &jsonErr
}
}