arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api: remove handleShutdown func

Browse Source 
This function was used for handling errors in the graceful library and
was never necessary for the v3 API.
This commit is contained in:
Jimmy Zelinskie 2018-09-10 13:26:53 -04:00
parent e5c2e378a2
commit dc6be5d1b0
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/v3/server.go
View File

@ -35,15 +35,6 @@ import (
"github.com/coreos/clair/database" "github.com/coreos/clair/database"
) )
// handleShutdown handles the server shut down error.
func handleShutdown(err error) {
if err != nil {
if opErr, ok := err.(*net.OpError); !ok || (ok && opErr.Op != "accept") {
log.Fatal(err)
}
}
}
var ( var (
promResponseDurationMilliseconds = prometheus.NewHistogramVec(prometheus.HistogramOpts{ promResponseDurationMilliseconds = prometheus.NewHistogramVec(prometheus.HistogramOpts{
Name: "clair_v3_api_response_duration_milliseconds", Name: "clair_v3_api_response_duration_milliseconds",
@ -178,7 +169,7 @@ func Run(Addr string, tlsConfig *tls.Config, CertFile, KeyFile string, store dat
tlsConfig.NextProtos = []string{"h2"} tlsConfig.NextProtos = []string{"h2"}
apiListener = tls.NewListener(tcpMux.Match(cmux.Any()), tlsConfig) apiListener = tls.NewListener(tcpMux.Match(cmux.Any()), tlsConfig)
go func() { handleShutdown(tcpMux.Serve()) }() go func() { tcpMux.Serve() }()
grpcServer := newGrpcServer(store, tlsConfig) grpcServer := newGrpcServer(store, tlsConfig)
gwmux := newGrpcGatewayServer(ctx, apiListener.Addr().String(), tlsConfig) gwmux := newGrpcGatewayServer(ctx, apiListener.Addr().String(), tlsConfig)
@ -191,10 +182,10 @@ func Run(Addr string, tlsConfig *tls.Config, CertFile, KeyFile string, store dat
} else { } else {
grpcL := tcpMux.Match(cmux.HTTP2HeaderField("content-type", "application/grpc")) grpcL := tcpMux.Match(cmux.HTTP2HeaderField("content-type", "application/grpc"))
apiListener = tcpMux.Match(cmux.Any()) apiListener = tcpMux.Match(cmux.Any())
go func() { handleShutdown(tcpMux.Serve()) }() go func() { tcpMux.Serve() }()
grpcServer := newGrpcServer(store, nil) grpcServer := newGrpcServer(store, nil)
go func() { handleShutdown(grpcServer.Serve(grpcL)) }() go func() { grpcServer.Serve(grpcL) }()
gwmux := newGrpcGatewayServer(ctx, apiListener.Addr().String(), nil) gwmux := newGrpcGatewayServer(ctx, apiListener.Addr().String(), nil)
@ -211,7 +202,7 @@ func Run(Addr string, tlsConfig *tls.Config, CertFile, KeyFile string, store dat
} }
// blocking call // blocking call
handleShutdown(srv.Serve(apiListener)) srv.Serve(apiListener)
log.Info("Grpc API stopped") log.Info("Grpc API stopped")
} }