Remove httputil.LogThenError so that the line numbers are reported properly - make error reporting slightly more useful (#879)

2 files changed, 13 insertions, 6 deletions

diff --git a/publicroomsapi/directory/directory.go b/publicroomsapi/directory/directory.go
index 88981549..e56fc6cc 100644
--- a/publicroomsapi/directory/directory.go
+++ b/publicroomsapi/directory/directory.go
@@ -18,6 +18,7 @@ import (
 	"net/http"
 
 	"github.com/matrix-org/dendrite/clientapi/httputil"
+	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/publicroomsapi/storage"
 	"github.com/matrix-org/gomatrixserverlib"
 
@@ -35,7 +36,8 @@ func GetVisibility(
 ) util.JSONResponse {
 	isPublic, err := publicRoomsDatabase.GetRoomVisibility(req.Context(), roomID)
 	if err != nil {
-		return httputil.LogThenError(req, err)
+		util.GetLogger(req.Context()).WithError(err).Error("publicRoomsDatabase.GetRoomVisibility failed")
+		return jsonerror.InternalServerError()
 	}
 
 	var v roomVisibility
@@ -64,7 +66,8 @@ func SetVisibility(
 
 	isPublic := v.Visibility == gomatrixserverlib.Public
 	if err := publicRoomsDatabase.SetRoomVisibility(req.Context(), isPublic, roomID); err != nil {
-		return httputil.LogThenError(req, err)
+		util.GetLogger(req.Context()).WithError(err).Error("publicRoomsDatabase.SetRoomVisibility failed")
+		return jsonerror.InternalServerError()
 	}
 
 	return util.JSONResponse{
diff --git a/publicroomsapi/directory/public_rooms.go b/publicroomsapi/directory/public_rooms.go
index 10aaa070..fd327942 100644
--- a/publicroomsapi/directory/public_rooms.go
+++ b/publicroomsapi/directory/public_rooms.go
@@ -60,11 +60,13 @@ func GetPostPublicRooms(
 	// ParseInt returns 0 and an error when trying to parse an empty string
 	// In that case, we want to assign 0 so we ignore the error
 	if err != nil && len(request.Since) > 0 {
-		return httputil.LogThenError(req, err)
+		util.GetLogger(req.Context()).WithError(err).Error("strconv.ParseInt failed")
+		return jsonerror.InternalServerError()
 	}
 
 	if response.Estimate, err = publicRoomDatabase.CountPublicRooms(req.Context()); err != nil {
-		return httputil.LogThenError(req, err)
+		util.GetLogger(req.Context()).WithError(err).Error("publicRoomDatabase.CountPublicRooms failed")
+		return jsonerror.InternalServerError()
 	}
 
 	if offset > 0 {
@@ -78,7 +80,8 @@ func GetPostPublicRooms(
 	if response.Chunk, err = publicRoomDatabase.GetPublicRooms(
 		req.Context(), offset, limit, request.Filter.SearchTerms,
 	); err != nil {
-		return httputil.LogThenError(req, err)
+		util.GetLogger(req.Context()).WithError(err).Error("publicRoomDatabase.GetPublicRooms failed")
+		return jsonerror.InternalServerError()
 	}
 
 	return util.JSONResponse{
@@ -96,7 +99,8 @@ func fillPublicRoomsReq(httpReq *http.Request, request *publicRoomReq) *util.JSO
 		// Atoi returns 0 and an error when trying to parse an empty string
 		// In that case, we want to assign 0 so we ignore the error
 		if err != nil && len(httpReq.FormValue("limit")) > 0 {
-			reqErr := httputil.LogThenError(httpReq, err)
+			util.GetLogger(httpReq.Context()).WithError(err).Error("strconv.Atoi failed")
+			reqErr := jsonerror.InternalServerError()
 			return &reqErr
 		}
 		request.Limit = int16(limit)