|
@@ -323,7 +323,7 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
|
|
node, err := logic.UpdateHostNetwork(currHost, network, false)
|
|
node, err := logic.UpdateHostNetwork(currHost, network, false)
|
|
if err != nil {
|
|
if err != nil {
|
|
if strings.Contains(err.Error(), "host not part of the network") && forceDelete {
|
|
if strings.Contains(err.Error(), "host not part of the network") && forceDelete {
|
|
- // force cleanup the nodex
|
|
|
|
|
|
+ // force cleanup the node
|
|
node, err := logic.GetNodeByHostRef(hostid, network)
|
|
node, err := logic.GetNodeByHostRef(hostid, network)
|
|
if err != nil {
|
|
if err != nil {
|
|
slog.Error("couldn't get node for host", "hostid", hostid, "network", network, "error", err)
|
|
slog.Error("couldn't get node for host", "hostid", hostid, "network", network, "error", err)
|
|
@@ -337,6 +337,8 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to force delete daemon node: "+err.Error()), "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to force delete daemon node: "+err.Error()), "internal"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ logic.ReturnSuccessResponse(w, r, "force deleted daemon node successfully")
|
|
|
|
+ return
|
|
}
|
|
}
|
|
logger.Log(0, r.Header.Get("user"), "failed to remove host from network:", hostid, network, err.Error())
|
|
logger.Log(0, r.Header.Get("user"), "failed to remove host from network:", hostid, network, err.Error())
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|