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

adding logs to server join

Browse source
This commit is contained in:
afeiszli 2021-07-26 14:11:46 -04:00
parent 037271f0aa
commit 6d18c67ea0
2 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
controllers/networkHttpController.go
View file

@ -8,13 +8,14 @@ import (
"net/http" "net/http"
"strings" "strings"
"time" "time"
"github.com/gravitl/netmaker/serverctl"
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/gravitl/netmaker/database" "github.com/gravitl/netmaker/database"
"github.com/gravitl/netmaker/functions" "github.com/gravitl/netmaker/functions"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/servercfg" "github.com/gravitl/netmaker/servercfg"
"github.com/gravitl/netmaker/serverctl"
) )
const ALL_NETWORK_ACCESS = "THIS_USER_HAS_ALL" const ALL_NETWORK_ACCESS = "THIS_USER_HAS_ALL"
@ -392,13 +393,13 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
return return
} }
success, err := serverctl.AddNetwork(network.NetID) success, err := serverctl.AddNetwork(network.NetID)
if err != nil || !success { if err != nil || !success {
if err == nil { if err == nil {
err = errors.New("Failed to add server to network " + network.DisplayName) err = errors.New("Failed to add server to network " + network.DisplayName)
} }
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
functions.PrintUserLog(r.Header.Get("user"), "created network "+network.NetID, 1) functions.PrintUserLog(r.Header.Get("user"), "created network "+network.NetID, 1)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
//json.NewEncoder(w).Encode(result) //json.NewEncoder(w).Encode(result)

30
serverctl/serverctl.go
View file

@ -67,19 +67,7 @@ func CreateCommsNetwork() (bool, error) {
return iscreated, err return iscreated, err
} }
func DownloadNetclient() error { func InstallNetclient() error {
/*
// Get the data
resp, err := http.Get("https://github.com/gravitl/netmaker/releases/download/latest/netclient")
if err != nil {
log.Println("could not download netclient")
return err
}
defer resp.Body.Close()
// Create the file
out, err := os.Create("/etc/netclient/netclient")
*/
if !FileExists("/etc/netclient/netclient") { if !FileExists("/etc/netclient/netclient") {
_, err := copy("./netclient/netclient", "/etc/netclient/netclient") _, err := copy("./netclient/netclient", "/etc/netclient/netclient")
if err != nil { if err != nil {
@ -87,10 +75,6 @@ func DownloadNetclient() error {
return err return err
} }
} }
//defer out.Close()
// Write the body to file
//_, err = io.Copy(out, resp.Body)
return nil return nil
} }
@ -168,7 +152,7 @@ func AddNetwork(network string) (bool, error) {
} }
_, err = os.Stat("/etc/netclient/netclient") _, err = os.Stat("/etc/netclient/netclient")
if os.IsNotExist(err) { if os.IsNotExist(err) {
err = DownloadNetclient() err = InstallNetclient()
if err != nil { if err != nil {
return false, err return false, err
} }
@ -179,12 +163,12 @@ func AddNetwork(network string) (bool, error) {
return false, err return false, err
} }
log.Println("executing network join: " + "/etc/netclient/netclient " + "join " + "-t " + token + " -name " + "netmaker" + " -endpoint " + pubip) log.Println("executing network join: " + "/etc/netclient/netclient " + "join " + "-t " + token + " -name " + "netmaker" + " -endpoint " + pubip)
out, err := exec.Command("/etc/netclient/netclient", "join", "-t", token, "-name", "netmaker", "-endpoint", pubip).Output()
if string(out) != "" { joinCMD := exec.Command("/etc/netclient/netclient", "join", "-t", token, "-name", "netmaker", "-endpoint", pubip)
log.Println(string(out)) err = joinCMD.Run()
}
if err != nil { if err != nil {
return false, errors.New(string(out) + err.Error()) log.Println("Failed to add server to network " + network)
return false, err
} }
log.Println("Server added to network " + network) log.Println("Server added to network " + network)
return true, err return true, err