gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 23:36:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed logging for comms join

Browse source
This commit is contained in:
afeiszli 2022-02-20 17:47:03 -05:00
parent c6612f9600
commit d0b940fab7
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
netclient/command/commands.go
View file

@ -19,7 +19,9 @@ func JoinComms(cfg *config.ClientConfig) error {
commsCfg.Server.GRPCAddress = cfg.Server.GRPCAddress
commsCfg.Server.GRPCSSL = cfg.Server.GRPCSSL
commsCfg.Server.CoreDNSAddr = cfg.Server.CoreDNSAddr
commsCfg.ReadConfig()
if commsCfg.ConfigFileExists() {
commsCfg.ReadConfig()
}
if commsCfg.Node.Name == "" {
if err := functions.JoinNetwork(commsCfg, "", true); err != nil {
return err

14
netclient/config/config.go
View file

@ -63,6 +63,17 @@ func Write(config *ClientConfig, network string) error {
return f.Sync()
}
func (config *ClientConfig) ConfigFileExists() bool {
home := ncutils.GetNetclientPathSpecific()
file := fmt.Sprintf(home + "netconfig-" + config.Network)
info, err := os.Stat(file)
if os.IsNotExist(err) {
return false
}
return !info.IsDir()
}
// ClientConfig.ReadConfig - used to read config from client disk into memory
func (config *ClientConfig) ReadConfig() {
@ -74,8 +85,7 @@ func (config *ClientConfig) ReadConfig() {
//f, err := os.Open(file)
f, err := os.OpenFile(file, os.O_RDONLY, 0600)
if err != nil {
fmt.Println("trouble opening file")
fmt.Println(err)
ncutils.PrintLog("trouble opening file: "+err.Error(), 1)
nofile = true
//fmt.Println("Could not access " + home + "/.netconfig, proceeding...")
}