@@ -138,6 +138,16 @@ func CheckFederationServer(localRuntimeID int64, connectTimeout time.Duration,
138
138
srvrLog .Debugf ("Attempting to connect to federation server %v" ,
139
139
server .HostStr ())
140
140
141
+ // Resolving the address first to ensure that we can connect to it.
142
+ resolvedAddr , err := server .Addr ()
143
+ if err != nil {
144
+ return fmt .Errorf ("error resolving server address %v: %w" ,
145
+ server .HostStr (), err )
146
+ }
147
+
148
+ srvrLog .Debugf ("Resolved federation server address: %v" ,
149
+ resolvedAddr .String ())
150
+
141
151
conn , err := ConnectUniverse (server )
142
152
if err != nil {
143
153
return fmt .Errorf ("error connecting to server %v: %w" ,
@@ -175,8 +185,7 @@ type universeClientConn struct {
175
185
func ConnectUniverse (
176
186
serverAddr universe.ServerAddr ) (* universeClientConn , error ) {
177
187
178
- // TODO(roasbeef): all info is authenticated, but also want to allow
179
- // brontide connect as well, can avoid TLS certs
188
+ uniAddr := serverAddr .HostStr ()
180
189
creds := credentials .NewTLS (& tls.Config {
181
190
InsecureSkipVerify : true ,
182
191
})
@@ -187,12 +196,8 @@ func ConnectUniverse(
187
196
grpc .WithDefaultCallOptions (MaxMsgReceiveSize ),
188
197
}
189
198
190
- uniAddr , err := serverAddr .Addr ()
191
- if err != nil {
192
- return nil , err
193
- }
194
-
195
- rawConn , err := grpc .Dial (uniAddr .String (), opts ... )
199
+ srvrLog .Infof ("Connecting to Universe server at %s" , uniAddr )
200
+ rawConn , err := grpc .NewClient (uniAddr , opts ... )
196
201
if err != nil {
197
202
return nil , fmt .Errorf ("unable to connect to RPC server: " +
198
203
"%w" , err )
0 commit comments