zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-03 00:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleaning logs, fixing mac apply

Browse Source
This commit is contained in:
afeiszli
2022-02-08 20:54:02 -05:00
parent 03f37b14f1
commit d5bae019b3
5 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mq/mq.go
View File

@@ -112,10 +112,8 @@ func PublishPeerUpdate(newNode *models.Node) error {
for _, node := range networkNodes {
if node.IsServer == "yes" || node.ID == newNode.ID {
log.Println("skipping update on " + node.Name + " : " + node.ID)
continue
}
log.Println("running update on " + node.Name + " : " + node.ID)
peerUpdate, err := logic.GetPeerUpdate(&node)
if err != nil {
logger.Log(1, "error getting peer update for node", node.ID, err.Error())

2
netclient/daemon/macos.go
View File

@@ -95,7 +95,7 @@ func MacDaemonString(interval string) string {
<key>Label</key><string>com.gravitl.netclient</string>
<key>ProgramArguments</key>
<array>
<string>/sbin/netclient</string>
<string>/usr/local/bin/netclient</string>
<string>daemon</string>
</array>
<key>StandardOutPath</key><string>/etc/netclient/com.gravitl.netclient.log</string>

19
netclient/functions/daemon.go
View File

@@ -53,7 +53,7 @@ func read(network, which string) string {
if readMessage.LastSeen.IsZero() {
return ""
}
if time.Now().After(readMessage.LastSeen.Add(time.Minute)) { // check if message has been there over a minute
if time.Now().After(readMessage.LastSeen.Add(time.Minute * 10)) { // check if message has been there over a minute
messageCache.Delete(fmt.Sprintf("%s%s", network, which)) // remove old message if expired
return ""
}
@@ -134,6 +134,7 @@ func SetupMQTT(cfg *config.ClientConfig, publish bool) mqtt.Client {
if err != nil {
ncutils.Log("could not run pull, please restart daemon or examine network connectivity --- " + err.Error())
}
ncutils.Log("connection re-established with mqtt server")
})
client := mqtt.NewClient(opts)
@@ -173,6 +174,7 @@ func MessageQueue(ctx context.Context, network string) {
ncutils.Log("netclient go routine started for " + network)
var cfg config.ClientConfig
cfg.Network = network
/*
var configPath = fmt.Sprintf("%snetconfig-%s", ncutils.GetNetclientPathSpecific(), network)
fileInfo, err := os.Stat(configPath)
if err != nil {
@@ -198,7 +200,9 @@ func MessageQueue(ctx context.Context, network string) {
sleepTime = sleepTime * 2
}
}
time.Sleep(time.Second << 1)
*/
cfg.ReadConfig()
ncutils.Log("daemon started for network: " + network)
client := SetupMQTT(&cfg, false)
@@ -365,12 +369,19 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
return
}
//err = wireguard.SyncWGQuickConf(cfg.Node.Interface, file)
err = wireguard.SetPeers(cfg.Node.Interface, cfg.Node.Address, cfg.Node.PersistentKeepalive, peerUpdate.Peers)
var iface = cfg.Node.Interface
if ncutils.IsMac() {
iface, err = local.GetMacIface(cfg.Node.Address)
if err != nil {
ncutils.Log("error syncing wg after peer update " + err.Error())
ncutils.Log("error retrieving mac iface: " + err.Error())
return
}
}
err = wireguard.SetPeers(iface, cfg.Node.Address, cfg.Node.PersistentKeepalive, peerUpdate.Peers)
if err != nil {
ncutils.Log("error syncing wg after peer update: " + err.Error())
return
}
ncutils.Log(fmt.Sprintf("received peer update on network, %s", cfg.Network))
}
// MonitorKeepalive - checks time last server keepalive received. If more than 3+ minutes, notify and resubscribe

4
netclient/ncutils/netclientutils.go
View File

@@ -570,9 +570,9 @@ func CheckWG() {
PrintLog(err.Error(), 0)
log.Fatal("WireGuard not installed. Please install WireGuard (wireguard-tools) and try again.")
}
PrintLog("Running with userspace wireguard: "+uspace, 0)
PrintLog("running with userspace wireguard: "+uspace, 0)
} else if uspace != "wg" {
log.Println("running userspace WireGuard with " + uspace)
PrintLog("running userspace WireGuard with "+uspace, 0)
}
}

3
netclient/wireguard/common.go
View File

@@ -174,7 +174,7 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
time.Sleep(time.Second >> 2)
d, _ = wgclient.Device(deviceiface)
}
ApplyConf(node, deviceiface, confPath) // Apply initially
ApplyConf(node, ifacename, confPath) // Apply initially
ncutils.PrintLog("waiting for interface...", 1) // ensure interface is created
output, _ := ncutils.RunCmd("wg", false)
starttime := time.Now()
@@ -355,7 +355,6 @@ func UpdateWgPeers(file string, peers []wgtypes.PeerConfig) error {
AllowNonUniqueSections: true,
AllowShadows: true,
}
ncutils.Log("updating " + file)
wireguard, err := ini.LoadSources(options, file)
if err != nil {
return err