cleanup

api/client.go

@@ -161,13 +161,15 @@ func (cl *Client) Connect() error {
 			gwCreds = []byte(gateway.TlsCertificate)
 		}
 		gwID := id.NewNodeFromBytes(cl.ndf.Nodes[i].ID).NewGateway()
-		globals.Log.INFO.Printf("Connecting to %s...", gateway.Address)
+		globals.Log.INFO.Printf("Connecting to gateway at %s...",
+			gateway.Address)
 		err = (cl.comm).(*io.Messaging).Comms.ConnectToGateway(gwID, gateway.Address, gwCreds)
 		if err != nil {
 			return errors.New(fmt.Sprintf("Failed to connect to gateway %s: %+v",
 				gateway.Address, err))
 		}
-		globals.Log.INFO.Printf("Connected to %v successfully!", gateway.Address)
+		globals.Log.INFO.Printf("Connected to gateway at %v successfully!",
+			gateway.Address)
 	}
 
 	//connect to the registration server
@@ -177,13 +179,18 @@ func (cl *Client) Connect() error {
 			regCert = []byte(cl.ndf.Registration.TlsCertificate)
 		}
 		addr := io.ConnAddr("registration")
+		globals.Log.INFO.Printf("Connecting to permissioning at %s...",
+			cl.ndf.Registration.Address)
 		err = (cl.comm).(*io.Messaging).Comms.ConnectToRegistration(addr, cl.ndf.Registration.Address, regCert)
 		if err != nil {
 			return errors.New(fmt.Sprintf(
 				"Failed connecting to permissioning: %+v", err))
 		}
+		globals.Log.INFO.Printf(
+			"Connected to permissioning at %v successfully!",
+			cl.ndf.Registration.Address)
 	} else {
-		globals.Log.WARN.Printf("Unable to find registration server!")
+		globals.Log.WARN.Printf("Unable to find permissioning server!")
 	}
 	return err
 }
@@ -445,10 +452,6 @@ func (cl *Client) Login(UID *id.User) (string, error) {
 		return "", err
 	}
 
-	if session == nil {
-		return "", errors.New("Unable to load session: " + err.Error())
-	}
-
 	cl.session = session
 	return cl.session.GetCurrentUser().Nick, nil
 }