Refacto graphql recovery
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
@@ -22,7 +22,6 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"runtime/debug"
|
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -38,11 +37,11 @@ import (
|
|||||||
"github.com/getprobo/probo/pkg/saferedirect"
|
"github.com/getprobo/probo/pkg/saferedirect"
|
||||||
"github.com/getprobo/probo/pkg/securecookie"
|
"github.com/getprobo/probo/pkg/securecookie"
|
||||||
"github.com/getprobo/probo/pkg/server/api/console/v1/schema"
|
"github.com/getprobo/probo/pkg/server/api/console/v1/schema"
|
||||||
|
gqlutils "github.com/getprobo/probo/pkg/server/graphql"
|
||||||
"github.com/getprobo/probo/pkg/statelesstoken"
|
"github.com/getprobo/probo/pkg/statelesstoken"
|
||||||
"github.com/getprobo/probo/pkg/usrmgr"
|
"github.com/getprobo/probo/pkg/usrmgr"
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/vektah/gqlparser/v2/gqlerror"
|
"github.com/vektah/gqlparser/v2/gqlerror"
|
||||||
"go.gearno.de/kit/httpserver"
|
|
||||||
"go.gearno.de/kit/log"
|
"go.gearno.de/kit/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -233,12 +232,7 @@ func graphqlHandler(logger *log.Logger, proboSvc *probo.Service, usrmgrSvc *usrm
|
|||||||
)
|
)
|
||||||
srv.Use(extension.Introspection{})
|
srv.Use(extension.Introspection{})
|
||||||
srv.Use(tracingExtension{})
|
srv.Use(tracingExtension{})
|
||||||
srv.SetRecoverFunc(func(ctx context.Context, err any) error {
|
srv.SetRecoverFunc(gqlutils.RecoverFunc)
|
||||||
logger := httpserver.LoggerFromContext(ctx)
|
|
||||||
logger.Error("resolver panic", log.Any("error", err), log.Any("stack", string(debug.Stack())))
|
|
||||||
|
|
||||||
return errors.New("internal server error")
|
|
||||||
})
|
|
||||||
|
|
||||||
srv.AroundOperations(
|
srv.AroundOperations(
|
||||||
func(ctx context.Context, next graphql.OperationHandler) graphql.ResponseHandler {
|
func(ctx context.Context, next graphql.OperationHandler) graphql.ResponseHandler {
|
||||||
|
|||||||
@@ -18,10 +18,8 @@ package trust_v1
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"runtime/debug"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/99designs/gqlgen/graphql/handler"
|
"github.com/99designs/gqlgen/graphql/handler"
|
||||||
@@ -34,11 +32,11 @@ import (
|
|||||||
console_v1 "github.com/getprobo/probo/pkg/server/api/console/v1"
|
console_v1 "github.com/getprobo/probo/pkg/server/api/console/v1"
|
||||||
"github.com/getprobo/probo/pkg/server/api/trust/v1/auth"
|
"github.com/getprobo/probo/pkg/server/api/trust/v1/auth"
|
||||||
"github.com/getprobo/probo/pkg/server/api/trust/v1/schema"
|
"github.com/getprobo/probo/pkg/server/api/trust/v1/schema"
|
||||||
|
gqlutils "github.com/getprobo/probo/pkg/server/graphql"
|
||||||
"github.com/getprobo/probo/pkg/statelesstoken"
|
"github.com/getprobo/probo/pkg/statelesstoken"
|
||||||
"github.com/getprobo/probo/pkg/trust"
|
"github.com/getprobo/probo/pkg/trust"
|
||||||
"github.com/getprobo/probo/pkg/usrmgr"
|
"github.com/getprobo/probo/pkg/usrmgr"
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"go.gearno.de/kit/httpserver"
|
|
||||||
"go.gearno.de/kit/log"
|
"go.gearno.de/kit/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -134,12 +132,7 @@ func graphqlHandler(logger *log.Logger, usrmgrSvc *usrmgr.Service, trustSvc *tru
|
|||||||
|
|
||||||
srv.Use(extension.Introspection{})
|
srv.Use(extension.Introspection{})
|
||||||
|
|
||||||
srv.SetRecoverFunc(func(ctx context.Context, err any) error {
|
srv.SetRecoverFunc(gqlutils.RecoverFunc)
|
||||||
logger := httpserver.LoggerFromContext(ctx)
|
|
||||||
logger.Error("resolver panic", log.Any("error", err), log.Any("stack", string(debug.Stack())))
|
|
||||||
|
|
||||||
return errors.New("internal server error")
|
|
||||||
})
|
|
||||||
|
|
||||||
return WithSession(usrmgrSvc, trustSvc, authCfg, trustAuthCfg, srv.ServeHTTP)
|
return WithSession(usrmgrSvc, trustSvc, authCfg, trustAuthCfg, srv.ServeHTTP)
|
||||||
}
|
}
|
||||||
|
|||||||
31
pkg/server/graphql/recovery.go
Normal file
31
pkg/server/graphql/recovery.go
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
|
||||||
|
//
|
||||||
|
// Permission to use, copy, modify, and/or distribute this software for any
|
||||||
|
// purpose with or without fee is hereby granted, provided that the above
|
||||||
|
// copyright notice and this permission notice appear in all copies.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||||
|
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||||
|
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||||
|
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||||
|
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||||
|
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
|
// PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
|
package graphql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"runtime/debug"
|
||||||
|
|
||||||
|
"go.gearno.de/kit/httpserver"
|
||||||
|
"go.gearno.de/kit/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
func RecoverFunc(ctx context.Context, err any) error {
|
||||||
|
logger := httpserver.LoggerFromContext(ctx)
|
||||||
|
logger.Error("resolver panic", log.Any("error", err), log.Any("stack", string(debug.Stack())))
|
||||||
|
|
||||||
|
return errors.New("internal server error")
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user