zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 17:29:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace ncutil.Log/PrintLog with logger.Log

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-03-20 11:12:05 -04:00
committed by 0xdcarns
parent 28efa45419
commit 11b1098390
28 changed files with 274 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netclient/wireguard/unix.go
View File

@@ -6,6 +6,7 @@ import (
"os"
"regexp"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/ncutils"
@@ -58,7 +59,7 @@ func ApplyWGQuickConf(confPath string, ifacename string) error {
} else {
_, err := os.Stat(confPath)
if err != nil {
ncutils.Log(confPath + " does not exist " + err.Error())
logger.Log(0, confPath+" does not exist "+err.Error())
return err
}
if ncutils.IfaceExists(ifacename) {
@@ -98,12 +99,12 @@ func SyncWGQuickConf(iface string, confPath string) error {
_, err = ncutils.RunCmd("wg syncconf "+iface+" "+tmpConf, true)
if err != nil {
log.Println(err.Error())
ncutils.Log("error syncing conf, resetting")
logger.Log(0, "error syncing conf, resetting")
err = ApplyWGQuickConf(confPath, iface)
}
errN := os.Remove(tmpConf)
if errN != nil {
ncutils.Log(errN.Error())
logger.Log(0, errN.Error())
}
return err
}