began adding macos service/daemon

This commit is contained in:
afeiszli
2021-09-19 14:03:47 -04:00
parent b828f7b6d9
commit a0586ea6d2
27 changed files with 1209 additions and 1034 deletions

View File

@@ -8,9 +8,9 @@ import (
nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/daemon"
"github.com/gravitl/netmaker/netclient/functions"
"github.com/gravitl/netmaker/netclient/local"
"github.com/gravitl/netmaker/netclient/netclientutils"
"github.com/gravitl/netmaker/netclient/ncutils"
"golang.zx2c4.com/wireguard/wgctrl"
)
@@ -28,34 +28,30 @@ func Join(cfg config.ClientConfig, privateKey string) error {
if err != nil && !cfg.DebugJoin {
if !strings.Contains(err.Error(), "ALREADY_INSTALLED") {
log.Println("Error installing: ", err)
ncutils.PrintLog("error installing: "+err.Error(), 1)
err = functions.LeaveNetwork(cfg.Network)
if err != nil {
err = local.WipeLocal(cfg.Network)
err = functions.WipeLocal(cfg.Network)
if err != nil {
log.Println("Error removing artifacts: ", err)
ncutils.PrintLog("error removing artifacts: "+err.Error(), 1)
}
}
if cfg.Daemon != "off" {
if netclientutils.IsLinux() {
err = local.RemoveSystemDServices(cfg.Network)
if ncutils.IsLinux() {
err = daemon.RemoveSystemDServices(cfg.Network)
}
if err != nil {
log.Println("Error removing services: ", err)
ncutils.PrintLog("error removing services: "+err.Error(), 1)
}
}
} else {
ncutils.PrintLog("success", 0)
}
return err
}
log.Println("joined " + cfg.Network)
ncutils.PrintLog("joined "+cfg.Network, 1)
if cfg.Daemon != "off" {
if netclientutils.IsWindows() {
err = local.CreateAndRunWindowsDaemon()
} else if netclientutils.IsMac() {
err = local.CreateAndRunMacDaemon()
} else {
err = functions.InstallDaemon(cfg)
}
err = daemon.InstallDaemon(cfg)
}
return err
}
@@ -75,13 +71,13 @@ func RunUserspaceDaemon() {
func CheckIn(cfg config.ClientConfig) error {
var err error
if cfg.Network == "" {
log.Println("Required, '-n'. No network provided. Exiting.")
ncutils.PrintLog("required, '-n', exiting", 0)
os.Exit(1)
} else if cfg.Network == "all" {
log.Println("Running CheckIn for all networks.")
ncutils.PrintLog("running checkin for all networks", 1)
networks, err := functions.GetNetworks()
if err != nil {
log.Println("Error retrieving networks. Exiting.")
ncutils.PrintLog("error retrieving networks, exiting", 1)
return err
}
for _, network := range networks {
@@ -91,14 +87,14 @@ func CheckIn(cfg config.ClientConfig) error {
}
err = functions.CheckConfig(*currConf)
if err != nil {
log.Printf("Error checking in for "+network+" network: ", err)
ncutils.PrintLog("error checking in for "+network+" network: "+err.Error(), 1)
} else {
log.Println("checked in successfully for " + network)
ncutils.PrintLog("checked in successfully for "+network, 1)
}
}
if len(networks) == 0 {
if netclientutils.IsWindows() { // Windows specific - there are no netclients, so stop daemon process
local.StopWindowsDaemon()
if ncutils.IsWindows() { // Windows specific - there are no netclients, so stop daemon process
daemon.StopWindowsDaemon()
}
}
err = nil
@@ -111,43 +107,46 @@ func CheckIn(cfg config.ClientConfig) error {
func Leave(cfg config.ClientConfig) error {
err := functions.LeaveNetwork(cfg.Network)
if err != nil {
log.Println("Error attempting to leave network " + cfg.Network)
ncutils.PrintLog("error attempting to leave network "+cfg.Network, 1)
} else {
ncutils.PrintLog("success", 0)
}
return err
}
func Push(cfg config.ClientConfig) error {
var err error
if cfg.Network == "all" || netclientutils.IsWindows() {
log.Println("No network selected. Running Push for all networks.")
if cfg.Network == "all" || ncutils.IsWindows() {
ncutils.PrintLog("pushing config to server for all networks.", 0)
networks, err := functions.GetNetworks()
if err != nil {
log.Println("Error retrieving networks. Exiting.")
ncutils.PrintLog("error retrieving networks, exiting.", 0)
return err
}
for _, network := range networks {
err = functions.Push(network)
if err != nil {
log.Printf("Error pushing network configs for "+network+" network: ", err)
log.Printf("error pushing network configs for "+network+" network: ", err)
} else {
log.Println("pushed network config for " + network)
ncutils.PrintLog("pushed network config for "+network, 1)
}
}
err = nil
} else {
err = functions.Push(cfg.Network)
}
log.Println("Completed pushing network configs to remote server.")
ncutils.PrintLog("completed pushing network configs to remote server", 1)
ncutils.PrintLog("success", 1)
return err
}
func Pull(cfg config.ClientConfig) error {
var err error
if cfg.Network == "all" {
log.Println("No network selected. Running Pull for all networks.")
ncutils.PrintLog("No network selected. Running Pull for all networks.", 0)
networks, err := functions.GetNetworks()
if err != nil {
log.Println("Error retrieving networks. Exiting.")
ncutils.PrintLog("Error retrieving networks. Exiting.", 1)
return err
}
for _, network := range networks {
@@ -155,14 +154,15 @@ func Pull(cfg config.ClientConfig) error {
if err != nil {
log.Printf("Error pulling network config for "+network+" network: ", err)
} else {
log.Println("pulled network config for " + network)
ncutils.PrintLog("pulled network config for "+network, 1)
}
}
err = nil
} else {
_, err = functions.Pull(cfg.Network, true)
}
log.Println("Completed pulling network and peer configs.")
ncutils.PrintLog("reset network and peer configs", 1)
ncutils.PrintLog("success", 1)
return err
}
@@ -172,7 +172,7 @@ func List(cfg config.ClientConfig) error {
}
func Uninstall() error {
log.Println("Uninstalling netclient")
ncutils.PrintLog("uninstalling netclient", 0)
err := functions.Uninstall()
return err
}