Skip to content
Snippets Groups Projects
Commit 7f67848a authored by Jake Taylor's avatar Jake Taylor :lips:
Browse files

Merge branch 'logFix' into 'release'

More log updates

See merge request !183
parents 2087dfe4 6f52d421
No related branches found
No related tags found
No related merge requests found
...@@ -161,15 +161,16 @@ func (cl *Client) Connect() error { ...@@ -161,15 +161,16 @@ func (cl *Client) Connect() error {
gwCreds = []byte(gateway.TlsCertificate) gwCreds = []byte(gateway.TlsCertificate)
} }
gwID := id.NewNodeFromBytes(cl.ndf.Nodes[i].ID).NewGateway() gwID := id.NewNodeFromBytes(cl.ndf.Nodes[i].ID).NewGateway()
globals.Log.INFO.Printf("Connecting to gateway at %s...", globals.Log.INFO.Printf("Connecting to gateway %s at %s...",
gateway.Address) gwID.String(), gateway.Address)
err = (cl.comm).(*io.Messaging).Comms.ConnectToGateway(gwID, gateway.Address, gwCreds) err = (cl.comm).(*io.Messaging).Comms.ConnectToGateway(gwID, gateway.Address, gwCreds)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Failed to connect to gateway %s: %+v", return errors.New(fmt.Sprintf(
gateway.Address, err)) "Failed to connect to gateway %s at %s: %+v",
gwID.String(), gateway.Address, err))
} }
globals.Log.INFO.Printf("Connected to gateway at %v successfully!", globals.Log.INFO.Printf("Connected to gateway %s at %s successfully!",
gateway.Address) gwID.String(), gateway.Address)
} }
//connect to the registration server //connect to the registration server
...@@ -459,10 +460,12 @@ func (cl *Client) Login(UID *id.User) (string, error) { ...@@ -459,10 +460,12 @@ func (cl *Client) Login(UID *id.User) (string, error) {
// Logs in user and sets session on client object // Logs in user and sets session on client object
// returns the nickname or error if login fails // returns the nickname or error if login fails
func (cl *Client) StartMessageReceiver() error { func (cl *Client) StartMessageReceiver() error {
(cl.comm).(*io.Messaging).SendGateway = sendGateway := id.NewNodeFromBytes(cl.ndf.Nodes[0].ID).NewGateway()
id.NewNodeFromBytes(cl.ndf.Nodes[0].ID).NewGateway() receiveGateway := id.NewNodeFromBytes(cl.ndf.Nodes[len(cl.ndf.Nodes)-1].ID).NewGateway()
(cl.comm).(*io.Messaging).ReceiveGateway = (cl.comm).(*io.Messaging).SendGateway = sendGateway
id.NewNodeFromBytes(cl.ndf.Nodes[len(cl.ndf.Nodes)-1].ID).NewGateway() (cl.comm).(*io.Messaging).ReceiveGateway = receiveGateway
globals.Log.INFO.Printf("Sending gateway: %s", sendGateway.String())
globals.Log.INFO.Printf("Receiving gateway: %s", receiveGateway.String())
// Initialize UDB and nickname "bot" stuff here // Initialize UDB and nickname "bot" stuff here
bots.InitBots(cl.session, cl.comm, cl.topology) bots.InitBots(cl.session, cl.comm, cl.topology)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment