X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2df5de69d74ab1fbf1fbcec23d392193522b0364..11f4d90ff07de3557a86d78cb8623ad059633d04:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 9e45e0f7e8..04c3e170ec 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -279,7 +279,11 @@ func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.F
 			// explicit port name/number) means listen on
 			// the well-known port for the specified
 			// protocol, "foo.example:https".
-			listenAddr = net.JoinHostPort(listenAddr, listenURL.Scheme)
+			port := listenURL.Scheme
+			if port == "ws" || port == "wss" {
+				port = "http" + port[2:]
+			}
+			listenAddr = net.JoinHostPort(listenAddr, port)
 		}
 		listener, err := net.Listen("tcp", listenAddr)
 		if err == nil {