Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand logging in case of embed server not being able to successfully start.

Browse Source 
So far the errors were directed to Etcd.Errc (channel) that is not being consumed in practice.

Signed-off-by: Piotr Tabor <ptab@google.com>
This commit is contained in:
Piotr Tabor 2022-06-15 12:14:21 +02:00
parent fc690531e2
commit fcc8fce4d2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/embed/etcd.go
View File

@ -766,6 +766,9 @@ func (e *Etcd) serveMetrics() (err error) {
}
func (e *Etcd) errHandler(err error) {
if err != nil {
e.GetLogger().Error("setting up serving from embedded etcd failed.", zap.Error(err))
}
select {
case <-e.stopc:
return

4
server/embed/serve.go
View File

@ -114,7 +114,9 @@ func (sctx *serveCtx) serve(
var gs *grpc.Server
defer func() {
if err != nil && gs != nil {
sctx.lg.Warn("stopping grpc server due to error", zap.Error(err))
gs.Stop()
sctx.lg.Warn("stopped grpc server due to error", zap.Error(err))
}
}()
@ -132,6 +134,7 @@ func (sctx *serveCtx) serve(
if s.Cfg.EnableGRPCGateway {
gwmux, err = sctx.registerGateway([]grpc.DialOption{grpc.WithInsecure()})
if err != nil {
sctx.lg.Error("registerGateway failed", zap.Error(err))
return err
}
}
@ -238,6 +241,7 @@ func (sctx *serveCtx) registerGateway(opts []grpc.DialOption) (*gw.ServeMux, err
conn, err := grpc.DialContext(ctx, addr, opts...)
if err != nil {
sctx.lg.Error("registerGateway failed to dial", zap.String("addr", addr), zap.Error(err))
return nil, err
}
gwmux := gw.NewServeMux()