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

refactoring servercfg

Browse Source
This commit is contained in:
afeiszli
2022-05-31 12:07:56 -04:00
parent c0070a1bd2
commit 8d422526b3
17 changed files with 100 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netclient/functions/pull.go
View File

@@ -57,9 +57,13 @@ func Pull(network string, iface bool) (*models.Node, error) {
if nodeGET.Peers == nil {
nodeGET.Peers = []wgtypes.PeerConfig{}
}
if nodeGET.ServerConfig.API != "" && nodeGET.ServerConfig.MQPort != "" {
if err = config.ModServerConfig(&nodeGET.ServerConfig, resNode.Network); err != nil {
logger.Log(0, "unable to update server config: "+err.Error())
}
}
if iface {
if err = config.ModConfig(&resNode); err != nil {
if err = config.ModNodeConfig(&resNode); err != nil {
return nil, err
}
if err = wireguard.SetWGConfig(network, false, nodeGET.Peers[:]); err != nil {
@@ -78,9 +82,6 @@ func Pull(network string, iface bool) (*models.Node, error) {
if bkupErr != nil {
logger.Log(0, "unable to update backup file")
}
if err = SetServerInfo(cfg); err != nil {
logger.Log(0, "error pulling server info: "+err.Error())
}
return &resNode, err
}