mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-21 15:56:07 +08:00
return after error
This commit is contained in:
parent
f118cff98a
commit
fd69be9b82
|
@ -153,12 +153,14 @@ func deleteHost(w http.ResponseWriter, r *http.Request) {
|
||||||
if currHost.IsRelay {
|
if currHost.IsRelay {
|
||||||
if _, _, err := logic.DeleteHostRelay(hostid); err != nil {
|
if _, _, err := logic.DeleteHostRelay(hostid); err != nil {
|
||||||
logger.Log(0, r.Header.Get("user"), "failed to dissociate host from relays:", err.Error())
|
logger.Log(0, r.Header.Get("user"), "failed to dissociate host from relays:", err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if currHost.IsRelayed {
|
if currHost.IsRelayed {
|
||||||
relayHost, err := logic.GetHost(currHost.RelayedBy)
|
relayHost, err := logic.GetHost(currHost.RelayedBy)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Log(0, r.Header.Get("user"), "failed to fetch relay host:", err.Error())
|
logger.Log(0, r.Header.Get("user"), "failed to fetch relay host:", err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
newRelayedHosts := make([]string, 0)
|
newRelayedHosts := make([]string, 0)
|
||||||
for _, relayedHostID := range relayHost.RelayedHosts {
|
for _, relayedHostID := range relayHost.RelayedHosts {
|
||||||
|
@ -169,6 +171,7 @@ func deleteHost(w http.ResponseWriter, r *http.Request) {
|
||||||
relayHost.RelayedHosts = newRelayedHosts
|
relayHost.RelayedHosts = newRelayedHosts
|
||||||
if err := logic.UpsertHost(relayHost); err != nil {
|
if err := logic.UpsertHost(relayHost); err != nil {
|
||||||
logger.Log(0, r.Header.Get("user"), "failed to update host relays:", err.Error())
|
logger.Log(0, r.Header.Get("user"), "failed to update host relays:", err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err = logic.RemoveHost(currHost); err != nil {
|
if err = logic.RemoveHost(currHost); err != nil {
|
||||||
|
|
Loading…
Reference in a new issue