From 9d6dd6fa6b7d8f52087bee8c9468245cacbffab9 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Thu, 20 Mar 2014 21:54:50 -0500 Subject: [PATCH] Don't fail RPC server create due to single iface. Rather than returning an error when creating the RPC server an it can't listen on any of the specified interfaces, only error when it can't listen on all of the specified interfaces. --- rpcserver.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index e6dea524..3c1fba74 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -368,8 +368,7 @@ func newRPCServer(listenAddrs []string, s *server) (*rpcServer, error) { listeners := make([]net.Listener, 0, len(ipv6ListenAddrs)+len(ipv4ListenAddrs)) for _, addr := range ipv4ListenAddrs { - var listener net.Listener - listener, err = tls.Listen("tcp4", addr, &tlsConfig) + listener, err := tls.Listen("tcp4", addr, &tlsConfig) if err != nil { rpcsLog.Warnf("Can't listen on %s: %v", addr, err) @@ -379,8 +378,7 @@ func newRPCServer(listenAddrs []string, s *server) (*rpcServer, error) { } for _, addr := range ipv6ListenAddrs { - var listener net.Listener - listener, err = tls.Listen("tcp6", addr, &tlsConfig) + listener, err := tls.Listen("tcp6", addr, &tlsConfig) if err != nil { rpcsLog.Warnf("Can't listen on %s: %v", addr, err) @@ -394,7 +392,7 @@ func newRPCServer(listenAddrs []string, s *server) (*rpcServer, error) { rpc.listeners = listeners - return &rpc, err + return &rpc, nil } // jsonAuthFail sends a message back to the client if the http auth is rejected.