zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 08:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove cfg.Registered

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-04-25 11:07:21 -04:00
parent f5aa1d1e62
commit 38309aab20
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
netclient/config/config.go
View File

@@ -23,7 +23,6 @@ import (
// ClientConfig - struct for dealing with client configuration
type ClientConfig struct {
Server ServerConfig `yaml:"server"`
Registered bool `yaml:"registered"`
Node models.Node `yaml:"node"`
NetworkSettings models.Network `yaml:"networksettings"`
Network string `yaml:"network"`

8
netclient/functions/join.go
View File

@@ -186,12 +186,10 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
if err != nil {
return err
}
if !cfg.Registered {
if err := Register(cfg, privateKey); err != nil {
logger.Log(0, "registration failed", err.Error())
}
if err := Register(cfg, privateKey); err != nil {
logger.Log(0, "registration failed", err.Error())
}
if cfg.Daemon != "off" && cfg.Registered {
if cfg.Daemon != "off" {
err = daemon.InstallDaemon(cfg)
if err != nil {
return err

3
netclient/functions/register.go
View File

@@ -46,7 +46,6 @@ func Register(cfg *config.ClientConfig, key string) error {
} else if err != nil {
return err
}
cfg.Registered = true
return nil
}
@@ -63,7 +62,7 @@ func RegisterWithServer(private *ed25519.PrivateKey, cfg *config.ClientConfig) e
if err != nil {
return err
}
response, err := API(data, http.MethodPut, url, token)
response, err := API(data, http.MethodPost, url, token)
if err != nil {
return err
}