Skip to content

Commit 0f6d76d

Browse files
committed
consistant logs
1 parent 0e0965a commit 0f6d76d

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

pkg/gofr/grpc.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ func newGRPCServer(c *container.Container, port int, cfg config.Config) (*grpcSe
9292
return nil, fmt.Errorf("%w: %d", ErrInvalidPort, port)
9393
}
9494

95-
c.Logger.Infof("creating new gRPC server on port %d", port)
96-
9795
registerGRPCMetrics(c)
9896

9997
middleware := make([]grpc.UnaryServerInterceptor, 0)
@@ -106,8 +104,6 @@ func newGRPCServer(c *container.Container, port int, cfg config.Config) (*grpcSe
106104
grpc_recovery.StreamServerInterceptor(),
107105
gofr_grpc.StreamObservabilityInterceptor(c.Logger, c.Metrics()))
108106

109-
c.Logger.Debugf("gRPC server created successfully on port %d", port)
110-
111107
return &grpcServer{
112108
port: port,
113109
interceptors: middleware,
@@ -151,6 +147,14 @@ func (g *grpcServer) Run(c *container.Container) {
151147
}
152148
}
153149

150+
if !isPortAvailable(g.port) {
151+
c.Logger.Fatalf("gRPC port %d is blocked or unreachable", g.port)
152+
c.Metrics().IncrementCounter(context.Background(), "grpc_server_errors_total")
153+
c.Metrics().SetGauge("grpc_server_status", 0)
154+
155+
return
156+
}
157+
154158
addr := ":" + strconv.Itoa(g.port)
155159

156160
c.Logger.Infof("starting gRPC server at %s", addr)
@@ -165,6 +169,7 @@ func (g *grpcServer) Run(c *container.Container) {
165169
}
166170

167171
c.Metrics().SetGauge("grpc_server_status", 1)
172+
c.Logger.Infof("gRPC server started successfully on %s", addr)
168173

169174
if err := g.server.Serve(listener); err != nil {
170175
c.Logger.Errorf("error in starting gRPC server at %s: %s", addr, err)
@@ -194,18 +199,14 @@ func (g *grpcServer) Shutdown(ctx context.Context) error {
194199

195200
// RegisterService adds a gRPC service to the GoFr application.
196201
func (a *App) RegisterService(desc *grpc.ServiceDesc, impl any) {
197-
if !a.grpcRegistered && !isPortAvailable(a.grpcServer.port) {
198-
a.container.Logger.Fatalf("gRPC port %d is blocked or unreachable", a.grpcServer.port)
199-
}
200-
201202
if !a.grpcRegistered {
202203
if err := a.grpcServer.createServer(); err != nil {
203204
a.container.Logger.Errorf("failed to create gRPC server for service %s: %v", desc.ServiceName, err)
204205
return
205206
}
206207
}
207208

208-
a.container.Logger.Infof("registering gRPC Server: %s", desc.ServiceName)
209+
a.container.Logger.Infof("registering gRPC Service: %s", desc.ServiceName)
209210
a.grpcServer.server.RegisterService(desc, impl)
210211

211212
a.container.Metrics().IncrementCounter(context.Background(), "grpc_services_registered_total")
@@ -216,7 +217,7 @@ func (a *App) RegisterService(desc *grpc.ServiceDesc, impl any) {
216217
}
217218

218219
a.grpcRegistered = true
219-
a.container.Logger.Debugf("successfully registered gRPC service: %s", desc.ServiceName)
220+
a.container.Logger.Infof("successfully registered gRPC service: %s", desc.ServiceName)
220221
}
221222

222223
func injectContainer(impl any, c *container.Container) error {

0 commit comments

Comments
 (0)