particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cloudapi/v2: detach HTTPErrorHandler from Server struct

Browse source
This commit is contained in:
Sanne Raymaekers 2024-06-25 12:12:10 +02:00
parent 135dd94de5
commit 39d2068d31
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/cloudapi/v2/errors.go
View file

@ -275,7 +275,7 @@ func apiErrorFromEchoError(echoError *echo.HTTPError) ServiceErrorCode {
} }
// Convert an echo error into an AOC compliant one so we send a correct json error response // Convert an echo error into an AOC compliant one so we send a correct json error response
func (s *Server) HTTPErrorHandler(echoError error, c echo.Context) { func HTTPErrorHandler(echoError error, c echo.Context) {
doResponse := func(details interface{}, code ServiceErrorCode, c echo.Context, internal error) { doResponse := func(details interface{}, code ServiceErrorCode, c echo.Context, internal error) {
if !c.Response().Committed { if !c.Response().Committed {
var err error var err error

2
internal/cloudapi/v2/server.go
View file

@ -86,7 +86,7 @@ func NewServer(workers *worker.Server, distros *distrofactory.Factory, repos *re
func (s *Server) Handler(path string) http.Handler { func (s *Server) Handler(path string) http.Handler {
e := echo.New() e := echo.New()
e.Binder = binder{} e.Binder = binder{}
e.HTTPErrorHandler = s.HTTPErrorHandler e.HTTPErrorHandler = HTTPErrorHandler
e.Logger = common.Logger() e.Logger = common.Logger()
// OperationIDMiddleware - generates OperationID random string and puts it into the contexts // OperationIDMiddleware - generates OperationID random string and puts it into the contexts