From d0b940fab7f0d42d7f3636e0f1577f7f41653c85 Mon Sep 17 00:00:00 2001 From: afeiszli Date: Sun, 20 Feb 2022 17:47:03 -0500 Subject: [PATCH] fixed logging for comms join --- netclient/command/commands.go | 4 +++- netclient/config/config.go | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/netclient/command/commands.go b/netclient/command/commands.go index 2ba4c126..e469e479 100644 --- a/netclient/command/commands.go +++ b/netclient/command/commands.go @@ -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 diff --git a/netclient/config/config.go b/netclient/config/config.go index 4cbf2b1e..20c25845 100644 --- a/netclient/config/config.go +++ b/netclient/config/config.go @@ -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...") }