From 9f97e2dae86606e69222bee866bde7ec7b28a45a Mon Sep 17 00:00:00 2001 From: Sreevani871 Date: Fri, 14 Aug 2020 10:47:31 +0530 Subject: [PATCH] Fix exitting collector abruptly after Zipkin sever close during explicit shutdown Signed-off-by: Sreevani871 --- cmd/collector/app/collector.go | 1 + cmd/collector/app/server/zipkin.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/collector/app/collector.go b/cmd/collector/app/collector.go index 29e191043c5..6fc197dd63d 100644 --- a/cmd/collector/app/collector.go +++ b/cmd/collector/app/collector.go @@ -110,6 +110,7 @@ func (c *Collector) Start(builderOpts *CollectorOptions) error { if zkServer, err := server.StartZipkinServer(&server.ZipkinServerParams{ HostPort: builderOpts.CollectorZipkinHTTPHostPort, Handler: c.spanHandlers.ZipkinSpansHandler, + HealthCheck: c.hCheck, AllowedHeaders: builderOpts.CollectorZipkinAllowedHeaders, AllowedOrigins: builderOpts.CollectorZipkinAllowedOrigins, Logger: c.logger, diff --git a/cmd/collector/app/server/zipkin.go b/cmd/collector/app/server/zipkin.go index 70faf00f0ae..b4fca5afe5a 100644 --- a/cmd/collector/app/server/zipkin.go +++ b/cmd/collector/app/server/zipkin.go @@ -76,7 +76,9 @@ func serveZipkin(server *http.Server, listener net.Listener, params *ZipkinServe server.Handler = cors.Handler(recoveryHandler(r)) go func(listener net.Listener, server *http.Server) { if err := server.Serve(listener); err != nil { - params.Logger.Fatal("Could not launch Zipkin server", zap.Error(err)) + if err != http.ErrServerClosed { + params.Logger.Fatal("Could not launch Zipkin server", zap.Error(err)) + } } params.HealthCheck.Set(healthcheck.Unavailable) }(listener, server)