13647: Use cluster config instead of custom keepstore config.

[arvados.git] / sdk / go / httpserver / httpserver.go

diff --git a/sdk/go/httpserver/httpserver.go b/sdk/go/httpserver/httpserver.go
index a94146f850f712888331912a2d2c66b6458c92a1..627e04f0be53d16814fba92399e4ca11d87891ec 100644 (file)
--- a/sdk/go/httpserver/httpserver.go
+++ b/sdk/go/httpserver/httpserver.go
@@ -43,7 +43,12 @@ func (srv *Server) Start() error {
        srv.cond = sync.NewCond(mutex.RLocker())
        srv.running = true
        go func() {
-               err = srv.Serve(tcpKeepAliveListener{srv.listener})
+               lnr := tcpKeepAliveListener{srv.listener}
+               if srv.TLSConfig != nil {
+                       err = srv.ServeTLS(lnr, "", "")
+               } else {
+                       err = srv.Serve(lnr)
+               }
                if !srv.wantDown {
                        srv.err = err
                }