mirror of
				https://github.com/gravitl/netmaker.git
				synced 2025-11-01 04:32:40 +08:00 
			
		
		
		
	removed unnecessary loop from daemon start
This commit is contained in:
		| @@ -42,36 +42,35 @@ type cachedMessage struct { | |||||||
|  |  | ||||||
| // Daemon runs netclient daemon from command line | // Daemon runs netclient daemon from command line | ||||||
| func Daemon() error { | func Daemon() error { | ||||||
| 	serverSet := make(map[string]config.ClientConfig) | 	serverSet := make(map[string]bool) | ||||||
| 	// == initial pull of all networks == | 	// == initial pull of all networks == | ||||||
| 	networks, _ := ncutils.GetSystemNetworks() | 	networks, _ := ncutils.GetSystemNetworks() | ||||||
| 	if len(networks) == 0 { | 	if len(networks) == 0 { | ||||||
| 		return errors.New("no networks") | 		return errors.New("no networks") | ||||||
| 	} | 	} | ||||||
| 	for _, network := range networks { |  | ||||||
| 		logger.Log(3, "initializing network", network) |  | ||||||
| 		cfg := config.ClientConfig{} |  | ||||||
| 		cfg.Network = network |  | ||||||
| 		cfg.ReadConfig() |  | ||||||
| 		serverSet[cfg.Server.Server] = cfg |  | ||||||
| 		if err := wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, ncutils.GetNetclientPathSpecific()+cfg.Node.Interface+".conf"); err != nil { |  | ||||||
| 			logger.Log(0, "failed to start ", cfg.Node.Interface, "wg interface", err.Error()) |  | ||||||
| 		} |  | ||||||
| 		//initialPull(cfg.Network) |  | ||||||
| 	} |  | ||||||
| 	// set ipforwarding on startup | 	// set ipforwarding on startup | ||||||
| 	err := local.SetIPForwarding() | 	err := local.SetIPForwarding() | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		logger.Log(0, err.Error()) | 		logger.Log(0, err.Error()) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	for _, network := range networks { | ||||||
|  | 		logger.Log(3, "initializing network", network) | ||||||
|  | 		cfg := config.ClientConfig{} | ||||||
|  | 		cfg.Network = network | ||||||
|  | 		cfg.ReadConfig() | ||||||
|  | 		if err := wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, ncutils.GetNetclientPathSpecific()+cfg.Node.Interface+".conf"); err != nil { | ||||||
|  | 			logger.Log(0, "failed to start ", cfg.Node.Interface, "wg interface", err.Error()) | ||||||
|  | 		} | ||||||
|  | 		server := cfg.Server.Server | ||||||
|  | 		if !serverSet[server] { | ||||||
| 			// == subscribe to all nodes for each on machine == | 			// == subscribe to all nodes for each on machine == | ||||||
| 	for server := range serverSet { | 			serverSet[server] = true | ||||||
| 			logger.Log(1, "started daemon for server ", server) | 			logger.Log(1, "started daemon for server ", server) | ||||||
| 			ctx, cancel := context.WithCancel(context.Background()) | 			ctx, cancel := context.WithCancel(context.Background()) | ||||||
| 			networkcontext.Store(server, cancel) | 			networkcontext.Store(server, cancel) | ||||||
| 		config := serverSet[server] | 			go messageQueue(ctx, &cfg) | ||||||
| 		go messageQueue(ctx, &config) | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	// == add waitgroup and cancel for checkin routine == | 	// == add waitgroup and cancel for checkin routine == | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 0xdcarns
					0xdcarns