gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-26 00:53:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

small refactors

Browse source
This commit is contained in:
0xdcarns 2022-04-25 19:28:56 -04:00
parent daa24b0dd5
commit a6ee8101e6
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mq/handlers.go
View file

@ -48,7 +48,7 @@ func Ping(client mqtt.Client, msg mqtt.Message) {
return
}
logger.Log(3, "ping processed for node", node.ID)
logger.Log(3, "ping processed for node", node.Name, node.ID)
// --TODO --set client version once feature is implemented.
//node.SetClientVersion(msg.Payload())
}()

6
netclient/functions/common.go
View file

@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"io"
"log"
"net"
"net/http"
@ -169,7 +169,7 @@ func LeaveNetwork(network string, force bool) error {
if response.StatusCode == http.StatusOK {
logger.Log(0, "deleted node", cfg.Node.Name, " on network ", cfg.Network)
} else {
bodybytes, _ := ioutil.ReadAll(response.Body)
bodybytes, _ := io.ReadAll(response.Body)
defer response.Body.Close()
return fmt.Errorf("error deleting node on server %s %s", response.Status, string(bodybytes))
}
@ -355,7 +355,7 @@ func Authenticate(cfg *config.ClientConfig) (string, error) {
}
defer response.Body.Close()
if response.StatusCode != http.StatusOK {
bodybytes, _ := ioutil.ReadAll(response.Body)
bodybytes, _ := io.ReadAll(response.Body)
return "", fmt.Errorf("failed to authenticate %s %s", response.Status, string(bodybytes))
}
resp := models.SuccessResponse{}

3
netclient/functions/join.go
View file

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"runtime"
@ -141,7 +140,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
var nodeGET models.NodeGet
if err := json.NewDecoder(response.Body).Decode(&nodeGET); err != nil {
//not sure the next line will work as response.Body probably needs to be reset before it can be read again
bodybytes, _ := ioutil.ReadAll(response.Body)
bodybytes, _ := io.ReadAll(response.Body)
return fmt.Errorf("error decoding node from server %w %s", err, string(bodybytes))
}
node := nodeGET.Node

4
netclient/functions/pull.go
View file

@ -4,7 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"runtime"
@ -39,7 +39,7 @@ func Pull(network string, iface bool) (*models.Node, error) {
return nil, err
}
if response.StatusCode != http.StatusOK {
bytes, err := ioutil.ReadAll(response.Body)
bytes, err := io.ReadAll(response.Body)
if err != nil {
fmt.Println(err)
}