zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor join, fix network add; db retry connect; fix port issue; sqlite default

Browse Source
This commit is contained in:
afeiszli
2021-09-10 15:48:18 -04:00
parent a86047ae85
commit c0490061ee
12 changed files with 183 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
controllers/networkHttpController.go
View File

@@ -364,16 +364,6 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "badrequest"))
return
}
if servercfg.IsClientMode() {
success, err := serverctl.AddNetwork(network.NetID)
if err != nil || !success {
if err == nil {
err = errors.New("Failed to add server to network " + network.DisplayName)
}
returnErrorResponse(w, r, formatError(err, "internal"))
return
}
}
functions.PrintUserLog(r.Header.Get("user"), "created network "+network.NetID, 1)
w.WriteHeader(http.StatusOK)
//json.NewEncoder(w).Encode(result)
@@ -400,7 +390,18 @@ func CreateNetwork(network models.Network) error {
return err
}
return nil
if servercfg.IsClientMode() {
var success bool
success, err = serverctl.AddNetwork(network.NetID)
if err != nil || !success {
DeleteNetwork(network.NetID)
if err == nil {
err = errors.New("Failed to add server to network " + network.DisplayName)
}
}
}
return err
}
// BEGIN KEY MANAGEMENT SECTION