Browse Source

fixed logging for comms join

afeiszli 3 years ago
parent
commit
d0b940fab7
2 changed files with 15 additions and 3 deletions
  1. 3 1
      netclient/command/commands.go
  2. 12 2
      netclient/config/config.go

+ 3 - 1
netclient/command/commands.go

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

+ 12 - 2
netclient/config/config.go

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