rmcguire/go-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix broken startup on disabled servers

Browse Source
This commit is contained in:
Ryan McGuire
2025-03-30 11:27:41 -04:00
parent 5c26accc34
commit 4f0c5fe665
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/app/run_grpc.go
View File

@ -3,14 +3,26 @@ package app
import (
"context"
"github.com/rs/zerolog"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/trace"
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts"
optsgrpc "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/grpc/opts"
optshttp "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts"
)
func (a *App) runGRPC(ctx context.Context) {
if a.GRPC == nil {
a.GRPC = &optsgrpc.AppGRPC{
GRPCDone: make(chan error),
}
}
if !a.cfg.GRPCEnabled() {
zerolog.Ctx(ctx).Info().Msg("skipping disabled GRPC server")
return
}
span := trace.SpanFromContext(ctx)
if err := a.initGRPC(ctx); err != nil {
span.RecordError(err)
@ -21,10 +33,10 @@ func (a *App) runGRPC(ctx context.Context) {
if a.GRPC.GetGatewayMux() != nil {
if a.HTTP.Handlers == nil {
a.HTTP.Handlers = make([]opts.HTTPHandler, 0, 1)
a.HTTP.Handlers = make([]optshttp.HTTPHandler, 0, 1)
}
a.HTTP.Handlers = append(a.HTTP.Handlers, opts.HTTPHandler{
a.HTTP.Handlers = append(a.HTTP.Handlers, optshttp.HTTPHandler{
Prefix: a.cfg.GRPC.GRPCGatewayPath,
StripPrefix: true,
Handler: a.GRPC.GetGatewayMux(),